Merge "Remove jobs for Gerrit 2.4.x"

jenkins/jobs/gerrit.yaml

@@ -1,96 +1,3 @@
-- job:
-    name: check-gerrit-unittests
-    project-type: maven
-    node: 'bare-precise || bare-trusty'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    prebuilders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - gerrit-preclean
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: com.google.gerrit
-        artifact-id: gerrit-parent
-      goals: 'clean package -Dgerrit.include-documentation=1 -X -B'
-
-    postbuilders:
-      - gerrit-postrun
-
-    publishers:
-      - war:
-          site: 'tarballs.openstack.org'
-          warfile: 'gerrit-war/target/gerrit*.war'
-          target: 'tarballs/ci/test/'
-      - console-log
-
-
-- job:
-    name: gate-gerrit-unittests
-    project-type: maven
-    node: 'bare-precise || bare-trusty'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    prebuilders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - gerrit-preclean
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: com.google.gerrit
-        artifact-id: gerrit-parent
-      goals: 'clean package -Dgerrit.include-documentation=1 -X -B'
-
-    postbuilders:
-      - gerrit-postrun
-
-    publishers:
-      - console-log
-
-- job:
-    name: gerrit-package
-    project-type: maven
-    node: 'bare-precise || bare-trusty'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    prebuilders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - gerrit-preclean
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: com.google.gerrit
-        artifact-id: gerrit-parent
-      goals: 'clean package -Dgerrit.include-documentation=1 -X -B'
-
-    postbuilders:
-      - gerrit-postrun
-
-    publishers:
-      - war:
-          site: 'tarballs.openstack.org'
-          warfile: 'gerrit-war/target/gerrit*.war'
-          target: 'tarballs/ci/gerrit'
-      - console-log
-
 - job:
     name: check-gerrit-buck
     node: 'bare-precise || bare-trusty'

zuul/layout.yaml

@@ -699,11 +699,6 @@ jobs:
     voting: false
   - name: ^(gate|check)-group-based-policy-dsvm-functional$
     voting: false
-# For Gerrit ver 2.4.x (using maven)
-  - name: ^(gate|check)-gerrit-unittests$
-    branch: ^openstack/2\.4.*$
-  - name: gerrit-package
-    branch: ^openstack/2\.4.*$
 # For Gerrit ver 2.8.x and later (using buck)
   - name: ^.*gerrit.*buck$
     branch: ^openstack/(?!2\.4).*$
@@ -3376,13 +3371,10 @@ projects:
     template:
       - name: merge-check
     check:
-      - check-gerrit-unittests
       - check-gerrit-buck
     gate:
-      - gate-gerrit-unittests
       - gate-gerrit-buck
     post:
-      - gerrit-package
       - gerrit-package-buck
     periodic:
       - javamelody-gerrit-plugin-stable-2.8