From 5e4a8ceba39ac93a8861e598c8bbd36f4aeb8724 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Mon, 9 Jul 2018 19:09:56 +0200 Subject: [PATCH] Remove sahara-extra legacy jobs, moving in-tree Namely: - legacy-post-sahara-extra-artifacts - legacy-sahara-extra-artifacts They are being moved in-tree (as native Zuul v3 jobs). Depends-On: https://review.openstack.org/581087 Change-Id: If5d3fc5bbaff025675b5a2cf40008ec9e65bf266 --- .../post-sahara-extra-artifacts/post.yaml | 21 -------- .../post-sahara-extra-artifacts/run.yaml | 51 ------------------- .../legacy/sahara-extra-artifacts/run.yaml | 51 ------------------- zuul.d/zuul-legacy-jobs.yaml | 13 ----- 4 files changed, 136 deletions(-) delete mode 100644 playbooks/legacy/post-sahara-extra-artifacts/post.yaml delete mode 100644 playbooks/legacy/post-sahara-extra-artifacts/run.yaml delete mode 100644 playbooks/legacy/sahara-extra-artifacts/run.yaml diff --git a/playbooks/legacy/post-sahara-extra-artifacts/post.yaml b/playbooks/legacy/post-sahara-extra-artifacts/post.yaml deleted file mode 100644 index 5c41c6dc..00000000 --- a/playbooks/legacy/post-sahara-extra-artifacts/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/' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/dist/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/post-sahara-extra-artifacts/run.yaml b/playbooks/legacy/post-sahara-extra-artifacts/run.yaml deleted file mode 100644 index 1cc5ff39..00000000 --- a/playbooks/legacy/post-sahara-extra-artifacts/run.yaml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-post-sahara-extra-artifacts from old job post-sahara-extra-artifacts - 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 \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export BRANCH=${ZUUL_BRANCH:-master} - # tell to script where it should place dist results - tools/build-all-artifacts.sh $BRANCH - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/sahara-extra-artifacts/run.yaml b/playbooks/legacy/sahara-extra-artifacts/run.yaml deleted file mode 100644 index 67c1c65b..00000000 --- a/playbooks/legacy/sahara-extra-artifacts/run.yaml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-sahara-extra-artifacts from old job gate-sahara-extra-artifacts - 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 \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export BRANCH=${ZUUL_BRANCH:-master} - # tell to script where it should place dist results - tools/build-all-artifacts.sh $BRANCH - executable: /bin/bash - 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 e879a556..69aa4cae 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -1419,13 +1419,6 @@ - openstack/oslo.vmware - openstack/tempest -- job: - name: legacy-post-sahara-extra-artifacts - parent: legacy-publish-openstack-artifacts - run: playbooks/legacy/post-sahara-extra-artifacts/run.yaml - post-run: playbooks/legacy/post-sahara-extra-artifacts/post.yaml - timeout: 3900 - - job: name: legacy-puppet-beaker-rspec parent: legacy-puppet-openstack-integration @@ -1938,12 +1931,6 @@ - openstack/sahara - openstack/sahara-dashboard -- job: - name: legacy-sahara-extra-artifacts - parent: legacy-base - run: playbooks/legacy/sahara-extra-artifacts/run.yaml - timeout: 3900 - - job: name: legacy-sandbox-tag parent: legacy-base