From 83f26c873b817c3a51a7720a1fb46eb418235e7c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 25 Jun 2020 14:30:53 +0200 Subject: [PATCH] Remove legacy-tempest-dsvm-networking-onos This job is not used anymore, remove it. Depends-On: https://review.opendev.org/737987 Change-Id: I0d003c3e4ddf290e07b5c413f06c104f7406d949 --- .../tempest-dsvm-networking-onos/post.yaml | 15 ---- .../tempest-dsvm-networking-onos/run.yaml | 80 ------------------- zuul.d/zuul-legacy-jobs.yaml | 11 --- 3 files changed, 106 deletions(-) delete mode 100644 playbooks/legacy/tempest-dsvm-networking-onos/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-onos/run.yaml diff --git a/playbooks/legacy/tempest-dsvm-networking-onos/post.yaml b/playbooks/legacy/tempest-dsvm-networking-onos/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-onos/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/tempest-dsvm-networking-onos/run.yaml b/playbooks/legacy/tempest-dsvm-networking-onos/run.yaml deleted file mode 100644 index a4a6f7d0..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-onos/run.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-networking-onos from old job gate-tempest-dsvm-networking-onos-ubuntu-xenial-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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin networking-onos https://opendev.org/openstack/networking-onos - - EOF - 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_NEUTRON=1 - # Make sure tempest is installed, but run it out of the post_test_hooks.sh - # script from the networking-onos repository. - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # Because we are testing a non standard project, add - # our project repository. This makes zuul do the right - # reference magic for testing changes. - export PROJECTS="openstack/networking-onos $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - function pre_test_hook { - if [ -f $BASE/new/networking-onos/devstack/pre_test_hook.sh ] ; then - . $BASE/new/networking-onos/devstack/pre_test_hook.sh - fi - } - export -f pre_test_hook - - function post_test_hook { - if [ -f $BASE/new/networking-onos/devstack/post_test_hook.sh ] ; then - . $BASE/new/networking-onos/devstack/post_test_hook.sh - fi - } - 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 8cfa95ae..eafc248e 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -726,17 +726,6 @@ - openstack/networking-bgpvpn - openstack/tempest -- job: - name: legacy-tempest-dsvm-networking-onos - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-networking-onos/run.yaml - post-run: playbooks/legacy/tempest-dsvm-networking-onos/post.yaml - timeout: 7800 - required-projects: - - openstack/devstack-gate - - openstack/networking-onos - - openstack/tempest - - job: name: legacy-tempest-dsvm-networking-ovn-ovs-release-ovsdbapp-src parent: legacy-dsvm-base