Merge "Remove legacy-ubuntu-trusty nodeset"

playbooks/legacy/gearman-plugin-maven-build-ubuntu-trusty/run.yaml

@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-gearman-plugin-maven-build-ubuntu-trusty from old
-    job gate-gearman-plugin-maven-build-ubuntu-trusty
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              https://opendev.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -x
-          sudo rm -f /etc/sudoers.d/zuul
-          # Prove that general sudo access is actually revoked
-          ! sudo -n true
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          /usr/local/jenkins/slave_scripts/version-properties.sh
-          source version.properties
-          mvn clean package -B -Dproject-version=$PROJECT_VER
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'

zuul.d/nodesets.yaml

@@ -62,12 +62,6 @@
       - name: primary
         label: opensuse-15
 
-- nodeset:
-    name: legacy-ubuntu-trusty
-    nodes:
-      - name: primary
-        label: ubuntu-trusty
-
 - nodeset:
     name: legacy-ubuntu-xenial
     nodes:

zuul.d/zuul-legacy-jobs.yaml

@@ -37,13 +37,6 @@
     run: playbooks/legacy/gearman-plugin-jenkinsci-upload/run.yaml
     timeout: 1800
 
-- job:
-    name: legacy-gearman-plugin-maven-build-ubuntu-trusty
-    parent: legacy-base
-    run: playbooks/legacy/gearman-plugin-maven-build-ubuntu-trusty/run.yaml
-    timeout: 1800
-    nodeset: legacy-ubuntu-trusty
-
 - job:
     name: legacy-gearman-plugin-maven-build
     parent: legacy-base