From aa76d78a993c12dcf8bf94ee48190bfc6a706ef8 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Mon, 30 Oct 2017 10:57:20 +0100 Subject: [PATCH] Remove legacy networking-sfc jobs These have been migrated in-repo in: Iaf6f8cc1eba9a75adbc824ec80d14519b4665642 Change-Id: I9f4de6d1e222bc358c7008fec1835328de3249a2 Depends-On: Ic28f2f86b3eb0c2a3c4e1c1d99449379446104a0 --- .../networking-sfc-functional-dsvm/post.yaml | 80 ----------------- .../networking-sfc-functional-dsvm/run.yaml | 75 ---------------- .../post.yaml | 15 ---- .../run.yaml | 88 ------------------- .../post.yaml | 15 ---- .../run.yaml | 83 ----------------- .../tempest-dsvm-networking-sfc/post.yaml | 15 ---- .../tempest-dsvm-networking-sfc/run.yaml | 87 ------------------ zuul.d/zuul-legacy-jobs.yaml | 45 ---------- 9 files changed, 503 deletions(-) delete mode 100644 playbooks/legacy/networking-sfc-functional-dsvm/post.yaml delete mode 100644 playbooks/legacy/networking-sfc-functional-dsvm/run.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-networking-sfc/post.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-networking-sfc/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-sfc-multinode/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-sfc-multinode/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-sfc/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-sfc/run.yaml diff --git a/playbooks/legacy/networking-sfc-functional-dsvm/post.yaml b/playbooks/legacy/networking-sfc-functional-dsvm/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/networking-sfc-functional-dsvm/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/networking-sfc-functional-dsvm/run.yaml b/playbooks/legacy/networking-sfc-functional-dsvm/run.yaml deleted file mode 100644 index 3f9f6030..00000000 --- a/playbooks/legacy/networking-sfc-functional-dsvm/run.yaml +++ /dev/null @@ -1,75 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-networking-sfc-functional-dsvm from old job gate-networking-sfc-functional-dsvm-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 networking-sfc git://git.openstack.org/openstack/networking-sfc - - 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_UNSTACK=1 - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=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-sfc $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - function gate_hook { - bash -xe $BASE/new/networking-sfc/networking_sfc/tests/contrib/gate_hook.sh dsvm-functional - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/networking-sfc/networking_sfc/tests/contrib/post_test_hook.sh dsvm-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/playbooks/legacy/periodic-tempest-dsvm-networking-sfc/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-networking-sfc/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-networking-sfc/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-networking-sfc/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-networking-sfc/run.yaml deleted file mode 100644 index fa0630a4..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-networking-sfc/run.yaml +++ /dev/null @@ -1,88 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-networking-sfc from old job - periodic-tempest-dsvm-networking-sfc-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 networking-sfc git://git.openstack.org/openstack/networking-sfc - - 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-sfc repository. - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - - export BRANCH_OVERRIDE=master - 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-sfc $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-sfc/devstack/pre_test_hook.sh ] ; then - . $BASE/new/networking-sfc/devstack/pre_test_hook.sh - fi - } - export -f pre_test_hook - - function gate_hook { - if [ -f $BASE/new/networking-sfc/networking_sfc/tests/contrib/gate_hook.sh ] ; then - bash -xe $BASE/new/networking-sfc/networking_sfc/tests/contrib/gate_hook.sh dsvm-networking-sfc - fi - } - export -f gate_hook - - function post_test_hook { - if [ -f $BASE/new/networking-sfc/devstack/post_test_hook.sh ] ; then - . $BASE/new/networking-sfc/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/playbooks/legacy/tempest-dsvm-networking-sfc-multinode/post.yaml b/playbooks/legacy/tempest-dsvm-networking-sfc-multinode/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-sfc-multinode/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-sfc-multinode/run.yaml b/playbooks/legacy/tempest-dsvm-networking-sfc-multinode/run.yaml deleted file mode 100644 index 15ae11f5..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-sfc-multinode/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-tempest-dsvm-networking-sfc-multinode from old job - gate-tempest-dsvm-networking-sfc-multinode-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-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 networking-sfc git://git.openstack.org/openstack/networking-sfc - - 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-sfc 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 - export DEVSTACK_GATE_TOPOLOGY="multinode" - - # 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-sfc $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-sfc/devstack/pre_test_hook.sh ] ; then - . $BASE/new/networking-sfc/devstack/pre_test_hook.sh - fi - } - export -f pre_test_hook - - function post_test_hook { - if [ -f $BASE/new/networking-sfc/devstack/post_test_hook.sh ] ; then - . $BASE/new/networking-sfc/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/playbooks/legacy/tempest-dsvm-networking-sfc/post.yaml b/playbooks/legacy/tempest-dsvm-networking-sfc/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-sfc/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-sfc/run.yaml b/playbooks/legacy/tempest-dsvm-networking-sfc/run.yaml deleted file mode 100644 index 5eac4111..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-sfc/run.yaml +++ /dev/null @@ -1,87 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-networking-sfc from old job gate-tempest-dsvm-networking-sfc-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 networking-sfc git://git.openstack.org/openstack/networking-sfc - - 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-sfc 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-sfc $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-sfc/devstack/pre_test_hook.sh ] ; then - . $BASE/new/networking-sfc/devstack/pre_test_hook.sh - fi - } - export -f pre_test_hook - - function gate_hook { - if [ -f $BASE/new/networking-sfc/networking_sfc/tests/contrib/gate_hook.sh ] ; then - bash -xe $BASE/new/networking-sfc/networking_sfc/tests/contrib/gate_hook.sh dsvm-networking-sfc - fi - } - export -f gate_hook - - function post_test_hook { - if [ -f $BASE/new/networking-sfc/devstack/post_test_hook.sh ] ; then - . $BASE/new/networking-sfc/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 2642d4fa..a9632c6a 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -3159,16 +3159,6 @@ - openstack/networking-midonet - openstack/rally -- job: - name: legacy-networking-sfc-functional-dsvm - parent: legacy-dsvm-base - run: playbooks/legacy/networking-sfc-functional-dsvm/run.yaml - post-run: playbooks/legacy/networking-sfc-functional-dsvm/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/networking-sfc - - job: name: legacy-networking-vpp-smoke parent: legacy-base @@ -4683,18 +4673,6 @@ - openstack/tap-as-a-service - openstack/tempest -- job: - name: legacy-periodic-tempest-dsvm-networking-sfc - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-networking-sfc/run.yaml - post-run: playbooks/legacy/periodic-tempest-dsvm-networking-sfc/post.yaml - timeout: 7800 - branches: master - required-projects: - - openstack-infra/devstack-gate - - openstack/networking-sfc - - openstack/tempest - - job: name: legacy-periodic-tempest-dsvm-neutron-full-newton parent: legacy-dsvm-base @@ -8053,29 +8031,6 @@ - openstack/networking-ovs-dpdk - openstack/tempest -- job: - name: legacy-tempest-dsvm-networking-sfc - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-networking-sfc/run.yaml - post-run: playbooks/legacy/tempest-dsvm-networking-sfc/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/networking-sfc - - openstack/tempest - -- job: - name: legacy-tempest-dsvm-networking-sfc-multinode - parent: legacy-dsvm-base-multinode - run: playbooks/legacy/tempest-dsvm-networking-sfc-multinode/run.yaml - post-run: playbooks/legacy/tempest-dsvm-networking-sfc-multinode/post.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/networking-sfc - - openstack/tempest - nodeset: legacy-ubuntu-xenial-2-node - - job: name: legacy-tempest-dsvm-neutron-dvr parent: legacy-dsvm-base