From dff838c8a11d4ebe4ba72031a133c907062483ba Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 16 Dec 2017 22:05:12 +0100 Subject: [PATCH] Remove legacy-irc-meetings-tox-ical The job is obsolete now, a new v3 native one is used instead. Change-Id: I5f61fa30116f5ef5403f4a5919ebbf865265f0fa Depends-On: Ida25d6b612474b9e42e16cf00bc3059c421796ef --- .../legacy/irc-meetings-tox-ical/post.yaml | 80 ------------------- .../legacy/irc-meetings-tox-ical/run.yaml | 57 ------------- zuul.d/zuul-legacy-jobs.yaml | 9 --- 3 files changed, 146 deletions(-) delete mode 100644 playbooks/legacy/irc-meetings-tox-ical/post.yaml delete mode 100644 playbooks/legacy/irc-meetings-tox-ical/run.yaml diff --git a/playbooks/legacy/irc-meetings-tox-ical/post.yaml b/playbooks/legacy/irc-meetings-tox-ical/post.yaml deleted file mode 100644 index 5c981c2b..00000000 --- a/playbooks/legacy/irc-meetings-tox-ical/post.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/output/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/irc-meetings-tox-ical/run.yaml b/playbooks/legacy/irc-meetings-tox-ical/run.yaml deleted file mode 100644 index e944e4a8..00000000 --- a/playbooks/legacy/irc-meetings-tox-ical/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-irc-meetings-tox-ical from old job gate-irc-meetings-tox-ical - 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: /usr/local/jenkins/slave_scripts/run-tox.sh ical - 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 c2024550..9862cd11 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -1319,15 +1319,6 @@ required-projects: - openstack/requirements -- job: - name: legacy-irc-meetings-tox-ical - parent: legacy-base - run: playbooks/legacy/irc-meetings-tox-ical/run.yaml - post-run: playbooks/legacy/irc-meetings-tox-ical/post.yaml - timeout: 1800 - required-projects: - - openstack/requirements - - job: name: legacy-its-storyboard-gerrit-plugin-stable-2.13 parent: legacy-publish-openstack-artifacts