From 13ba243236106ab7f58da3d8b778044f53e45dea Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 26 Sep 2018 09:19:25 +0200 Subject: [PATCH] Remove tricircle dsvm jobs These jobs are now in-tree, remove them here. Change-Id: I8fb8a3720a92bd83e1b63a62cab398ee743dc917 --- .../tricircle-dsvm-functional/post.yaml | 80 ------------------- .../legacy/tricircle-dsvm-functional/run.yaml | 71 ---------------- .../tricircle-dsvm-multiregion/post.yaml | 80 ------------------- .../tricircle-dsvm-multiregion/run.yaml | 65 --------------- zuul.d/zuul-legacy-jobs.yaml | 22 ----- 5 files changed, 318 deletions(-) delete mode 100644 playbooks/legacy/tricircle-dsvm-functional/post.yaml delete mode 100644 playbooks/legacy/tricircle-dsvm-functional/run.yaml delete mode 100644 playbooks/legacy/tricircle-dsvm-multiregion/post.yaml delete mode 100644 playbooks/legacy/tricircle-dsvm-multiregion/run.yaml diff --git a/playbooks/legacy/tricircle-dsvm-functional/post.yaml b/playbooks/legacy/tricircle-dsvm-functional/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/tricircle-dsvm-functional/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=**/*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 - - - 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=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/tricircle-dsvm-functional/run.yaml b/playbooks/legacy/tricircle-dsvm-functional/run.yaml deleted file mode 100644 index 877ad978..00000000 --- a/playbooks/legacy/tricircle-dsvm-functional/run.yaml +++ /dev/null @@ -1,71 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tricircle-dsvm-functional from old job gate-tricircle-dsvm-functional-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin tricircle git://git.openstack.org/openstack/tricircle - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export BRANCH_OVERRIDE=default - export PROJECTS="openstack/tricircle $PROJECTS" - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=0 - export DEVSTACK_GATE_TEMPEST_REGEX="tricircle.tempestplugin" - - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function pre_test_hook { - cd /opt/stack/new/tricircle/tricircle/tempestplugin/ - ./pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/tricircle/tricircle/tempestplugin/ - ./post_test_hook.sh - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/tricircle-dsvm-multiregion/post.yaml b/playbooks/legacy/tricircle-dsvm-multiregion/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/tricircle-dsvm-multiregion/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=**/*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 - - - 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=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/tricircle-dsvm-multiregion/run.yaml b/playbooks/legacy/tricircle-dsvm-multiregion/run.yaml deleted file mode 100644 index 509e3eeb..00000000 --- a/playbooks/legacy/tricircle-dsvm-multiregion/run.yaml +++ /dev/null @@ -1,65 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-tricircle-dsvm-multiregion from old job gate-tricircle-dsvm-multiregion-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export PROJECTS="openstack/tricircle $PROJECTS" - export PROJECTS="openstack/networking-sfc $PROJECTS" - export DEVSTACK_GATE_CONFIGDRIVE=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=0 - export DEVSTACK_GATE_TEMPEST_REGEX="tricircle.tempestplugin" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - # Enable multinode mode, so that the subnode(the second node) - # will be configured to run as second region in pre_test_hook.sh - export DEVSTACK_GATE_TOPOLOGY="multinode" - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function gate_hook { - bash -xe $BASE/new/tricircle/tricircle/tempestplugin/gate_hook.sh - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/tricircle/tricircle/tempestplugin/post_test_hook.sh - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - 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 438145a6..46da0a22 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -1993,28 +1993,6 @@ - openstack/devstack-plugin-zmq - openstack/tempest -- job: - name: legacy-tricircle-dsvm-functional - parent: legacy-dsvm-base - run: playbooks/legacy/tricircle-dsvm-functional/run.yaml - post-run: playbooks/legacy/tricircle-dsvm-functional/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/tricircle - -- job: - name: legacy-tricircle-dsvm-multiregion - parent: legacy-dsvm-base-multinode - run: playbooks/legacy/tricircle-dsvm-multiregion/run.yaml - post-run: playbooks/legacy/tricircle-dsvm-multiregion/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/networking-sfc - - openstack/tricircle - nodeset: legacy-ubuntu-xenial-2-node - - job: name: legacy-trio2o-dsvm-functional parent: legacy-dsvm-base