448429: end support for Bugzilla 3

Change-Id: I7ec71b76c9de4d685b9929105754fbe98025ca01
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=448429

3 files changed, 22 insertions, 43 deletions

diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
index cacaccc5e..4d8304f22 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -23,22 +23,6 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
   
   /* Sites */
 
-  bugzilla::site { "bugzilla-3.6.13-custom-wf":
-    major       => "3",
-    minor       => "6",
-    branchTag   => "bugzilla-3.6.13",
-    custom_wf   => true,
-  }
-
-  bugzilla::site { "bugzilla-3.6.13-custom-wf-and-status":
-    major                => "3",
-    minor                => "6",
-    branchTag            => "bugzilla-3.6.13",
-    custom_wf_and_status => true,
-    xmlrpc_enabled       => false,
-    desciptorfile        => "DescriptorFile-custom-wf-and-status.txt"
-  }
-
   bugzilla::site { "bugzilla-4.0.15":
     major   => "4",
     minor   => "0",
@@ -62,6 +46,20 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
     envdefault => true,
   }
 
+  bugzilla::site { "bugzilla-4.4.6-custom-wf":
+    major       => "4",
+    minor       => "4",
+    branchTag   => "bugzilla-4.4.6",
+    custom_wf   => true,
+  }
+
+  bugzilla::site { "bugzilla-4.4.6-custom-wf-and-status":
+    major                => "4",
+    minor                => "4",
+    branchTag            => "bugzilla-4.4.6",
+    custom_wf_and_status => true,
+  }
+
 /*
   bugzilla::site { "bugzilla-master":
     major       => "5",
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb
index 162f90380..f3b12b369 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb
@@ -28,15 +28,11 @@ our $VERSION = '0.01';
 
 <% if @custom_wf %>
 use constant STATUS_WORKFLOW => (
-	['REOPENED','UNCONFIRMED'],
-	['REOPENED','VERIFIED'],
-	['REOPENED','CLOSED'],
-	['NEW','CLOSED'],
+	['IN_PROGRESS','UNCONFIRMED'],
+	['CONFIRMED','VERIFIED'],
 );
 use constant STATUS_WORKFLOW_DELETE => (
-	['CLOSED','UNCONFIRMED'],
-	['CLOSED','REOPENED'],
-	['ASSIGNED','NEW'],
+	['IN_PROGRESS','CONFIRMED'],
 );
 <% end %>
 <% if @custom_wf_and_status %>
@@ -44,26 +40,11 @@ use constant STATUS_WORKFLOW => (
 	['VERIFIED','MODIFIED'],
 	['ON_DEV','POST'],
 	['MODIFIED','ON_DEV'],
-	['CLOSED','VERIFIED'],
-	['NEW','UNCONFIRMED'],
 );
 use constant STATUS_WORKFLOW_DELETE => (
 	['UNCONFIRMED','ASSIGNED'],
 	['RESOLVED','UNCONFIRMED'],
 	['VERIFIED','UNCONFIRMED'],
-	['CLOSED','UNCONFIRMED'],
-	['ASSIGNED','NEW'],
-	['REOPENED','NEW'],
-	['REOPENED','ASSIGNED'],
-	['RESOLVED','REOPENED'],
-	['VERIFIED','REOPENED'],
-	['CLOSED','REOPENED'],
-	['UNCONFIRMED','RESOLVED'],
-	['NEW','RESOLVED'],
-	['ASSIGNED','RESOLVED'],
-	['REOPENED','RESOLVED'],
-	['RESOLVED','VERIFIED'],
-
 );
 <% end %>
 
@@ -384,9 +365,9 @@ sub install_before_final_checks {
 <% if @custom_wf %>
 	my %status_ids = @{ $dbh->selectcol_arrayref(
 		'SELECT value, id FROM bug_status', {Columns=>[1,2]}) };
-		my $old_id =  $status_ids{'REOPENED'};
+		my $old_id =  $status_ids{'IN_PROGRESS'};
 		my $new_id = $status_ids{'UNCONFIRMED'};
-    if (!$dbh->selectrow_array('SELECT 1 FROM status_workflow where old_status ='. $old_id . ' and new_status ='.$new_id)) {
+    if (!$dbh->selectrow_array('SELECT 1 FROM status_workflow where old_status = '. $old_id . ' and new_status = '.$new_id)) {
 		print "create additional status_workflow...\n" unless $args->{silent};
 		my $sth_insert = $dbh->prepare('INSERT INTO status_workflow (old_status, new_status)
 										VALUES (?, ?)');
@@ -414,9 +395,9 @@ sub install_before_final_checks {
 	}
 	my %status_ids = @{ $dbh->selectcol_arrayref(
 		'SELECT value, id FROM bug_status', {Columns=>[1,2]}) };
-		my $old_id =  $status_ids{'REOPENED'};
+		my $old_id =  $status_ids{'IN_PROGRESS'};
 		my $new_id = $status_ids{'UNCONFIRMED'};
-    if (!$dbh->selectrow_array('SELECT 1 FROM status_workflow where old_status ='. $old_id . ' and new_status ='.$new_id)) {
+    if (!$dbh->selectrow_array('SELECT 1 FROM status_workflow where old_status = '. $old_id . ' and new_status = '.$new_id)) {
 		print "create additional status_workflow...\n" unless $args->{silent};
 		my $sth_insert = $dbh->prepare('INSERT INTO status_workflow (old_status, new_status)
 										VALUES (?, ?)');
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb
index b5b219985..eca2ac51a 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb
@@ -18,6 +18,6 @@ $answer{'usestatuswhiteboard'} = '1';
 $answer{'maintainer'} = 'admin@mylyn.eclipse.org';
 
 $answer{'insidergroup'} = 'bz_canusewhineatothers';
-<% if @custom_wf_and_status %>$answer{'duplicate_or_move_bug_status'} = 'CLOSED';<% end %>
+<% if @custom_wf_and_status %>$answer{'duplicate_or_move_bug_status'} = 'VERIFIED';<% end %>
 <% if @usebugaliases %>$answer{'usebugaliases'} = '1';<% end %>
 $answer{'NO_PAUSE'} = 1