From 7d17d0ddaae65ec154c301bf54f146b3e6f76811 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 26 Dec 2017 17:11:52 +0100 Subject: [PATCH] Remove training-labs legacy jobs These jobs have been migrated to Zuul v3 native and are in-tree. Remove them. Change-Id: Idab9d5daec93625e8d130d63a6b6121ec1a0fd3f Depends-On: Id866646c81ccc0c89a24cea006f0df6b23756ece --- .../gate-training-labs-scripts/run.yaml | 57 ------------------- .../legacy/training-labs-scripts/post.yaml | 21 ------- .../legacy/training-labs-scripts/run.yaml | 57 ------------------- zuul.d/zuul-legacy-jobs.yaml | 13 ----- 4 files changed, 148 deletions(-) delete mode 100644 playbooks/legacy/gate-training-labs-scripts/run.yaml delete mode 100644 playbooks/legacy/training-labs-scripts/post.yaml delete mode 100644 playbooks/legacy/training-labs-scripts/run.yaml diff --git a/playbooks/legacy/gate-training-labs-scripts/run.yaml b/playbooks/legacy/gate-training-labs-scripts/run.yaml deleted file mode 100644 index 868f73e1..00000000 --- a/playbooks/legacy/gate-training-labs-scripts/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-gate-training-labs-scripts from old job gate-training-labs-scripts-ubuntu-xenial - 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 \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - 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: ./tools/generate-labs $ZUUL_REFNAME - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/training-labs-scripts/post.yaml b/playbooks/legacy/training-labs-scripts/post.yaml deleted file mode 100644 index d2fbc8b0..00000000 --- a/playbooks/legacy/training-labs-scripts/post.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- hosts: primary - tasks: - - - name: Ensure artifacts directory exists - file: - path: '{{ zuul.executor.work_root }}/artifacts' - state: directory - delegate_to: localhost - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.work_root }}/artifacts/dist/' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/build/dist/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/training-labs-scripts/run.yaml b/playbooks/legacy/training-labs-scripts/run.yaml deleted file mode 100644 index 25c34e2b..00000000 --- a/playbooks/legacy/training-labs-scripts/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-training-labs-scripts from old job training-labs-scripts-ubuntu-xenial - 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 \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - 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: ./tools/generate-labs $ZUUL_REFNAME - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 1d16365d..94c45258 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -590,12 +590,6 @@ - openstack/devstack-plugin-container - openstack/fuxi -- job: - name: legacy-gate-training-labs-scripts - parent: legacy-base - run: playbooks/legacy/gate-training-labs-scripts/run.yaml - timeout: 1800 - - job: name: legacy-gearman-plugin-hpi-artifact parent: legacy-publish-openstack-artifacts @@ -5945,13 +5939,6 @@ required-projects: - openstack/requirements -- job: - name: legacy-training-labs-scripts - parent: legacy-publish-openstack-artifacts - run: playbooks/legacy/training-labs-scripts/run.yaml - post-run: playbooks/legacy/training-labs-scripts/post.yaml - timeout: 1800 - - job: name: legacy-tricircle-dsvm-functional parent: legacy-dsvm-base