From 8052aa4c53620bbe9a5f8142e9b345ca89265715 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 15 May 2019 18:56:07 +0200 Subject: [PATCH] Remove unused jobs These jobs are migrated in-tree or are unused, remove them. Depends-On: https://review.opendev.org/659365 Change-Id: I19881b228806faf0a3745c4d60821c09cc499bbb --- .../post.yaml | 15 ---- .../periodic-tempest-dsvm-all-master/run.yaml | 42 ---------- .../post.yaml | 15 ---- .../sqlalchemy-migrate-devstack-dsvm/run.yaml | 49 ------------ .../zaqarclient-dsvm-functional/post.yaml | 80 ------------------- .../zaqarclient-dsvm-functional/run.yaml | 74 ----------------- zuul.d/zuul-legacy-jobs.yaml | 35 -------- 7 files changed, 310 deletions(-) delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-all-master/post.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-all-master/run.yaml delete mode 100644 playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/post.yaml delete mode 100644 playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/run.yaml delete mode 100644 playbooks/legacy/zaqarclient-dsvm-functional/post.yaml delete mode 100644 playbooks/legacy/zaqarclient-dsvm-functional/run.yaml diff --git a/playbooks/legacy/periodic-tempest-dsvm-all-master/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-all-master/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-all-master/post.yaml +++ /dev/null @@ -1,15 +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=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/periodic-tempest-dsvm-all-master/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-all-master/run.yaml deleted file mode 100644 index c26ce672..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-all-master/run.yaml +++ /dev/null @@ -1,42 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-all-master from old job periodic-tempest-dsvm-all-master - 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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_ALL=1 - export DEVSTACK_GATE_NEUTRON=1 - export BRANCH_OVERRIDE=master - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - 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/sqlalchemy-migrate-devstack-dsvm/post.yaml b/playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/post.yaml +++ /dev/null @@ -1,15 +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=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/run.yaml b/playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/run.yaml deleted file mode 100644 index afdfa35b..00000000 --- a/playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/run.yaml +++ /dev/null @@ -1,49 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-sqlalchemy-migrate-devstack-dsvm from old job gate-sqlalchemy-migrate-devstack-dsvm-nv - 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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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="x/sqlalchemy-migrate $PROJECTS" - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function pre_test_hook { - cd /opt/stack/new/sqlalchemy-migrate - sudo -H pip install . - } - export -f pre_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/zaqarclient-dsvm-functional/post.yaml b/playbooks/legacy/zaqarclient-dsvm-functional/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/zaqarclient-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/zaqarclient-dsvm-functional/run.yaml b/playbooks/legacy/zaqarclient-dsvm-functional/run.yaml deleted file mode 100644 index 0992a66f..00000000 --- a/playbooks/legacy/zaqarclient-dsvm-functional/run.yaml +++ /dev/null @@ -1,74 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-zaqarclient-dsvm-functional from old job gate-zaqarclient-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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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 zaqar https://opendev.org/openstack/zaqar - # Enable Zaqar Tempest Plugin - TEMPEST_PLUGINS='/opt/stack/new/zaqar-tempest-plugin' - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/python-zaqarclient $PROJECTS" - export PROJECTS="openstack/zaqar-ui $PROJECTS" - export PYTHONUNBUFFERED=true - export FUNCTEST_TIMEOUT=30 - export DEVSTACK_GATE_ZAQAR=1 - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export ENABLED_SERVICES=mysql,key,tempest - export DEVSTACK_GATE_TEMPEST_REGEX="zaqar_tempest_plugin.tests" - export BRANCH_OVERRIDE=default - - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS" - export ZAQARCLIENT_AUTH_FUNCTIONAL=1 - export ZAQARCLIENT_TEST_FUNCTIONAL=1 - function post_test_hook { - cd /opt/stack/new/python-zaqarclient - nosetests tests.functional - } - - 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 e21b3b67..b099f85a 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -836,17 +836,6 @@ - openstack/neutron-dynamic-routing - openstack/tempest -- job: - name: legacy-periodic-tempest-dsvm-all-master - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-all-master/run.yaml - post-run: playbooks/legacy/periodic-tempest-dsvm-all-master/post.yaml - timeout: 10800 - branches: master - required-projects: - - openstack/devstack-gate - - openstack/tempest - - job: name: legacy-periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata parent: legacy-dsvm-base @@ -1124,17 +1113,6 @@ - openstack/neutron - x/scalpels -- job: - name: legacy-sqlalchemy-migrate-devstack-dsvm - parent: legacy-dsvm-base - run: playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/run.yaml - post-run: playbooks/legacy/sqlalchemy-migrate-devstack-dsvm/post.yaml - timeout: 10800 - required-projects: - - openstack/devstack - - openstack/devstack-gate - - x/sqlalchemy-migrate - - job: name: legacy-storyboard-js-integration parent: legacy-base @@ -1700,19 +1678,6 @@ - openstack/devstack-gate - x/trio2o -- job: - name: legacy-zaqarclient-dsvm-functional - parent: legacy-dsvm-base - run: playbooks/legacy/zaqarclient-dsvm-functional/run.yaml - post-run: playbooks/legacy/zaqarclient-dsvm-functional/post.yaml - timeout: 6000 - required-projects: - - openstack/devstack-gate - - openstack/python-zaqarclient - - openstack/zaqar - - openstack/zaqar-tempest-plugin - - openstack/zaqar-ui - - job: name: legacy-zmq-event-publisher-hpi-artifact parent: legacy-publish-openstack-artifacts