diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run.yaml index c49225355..b64b48f0f 100644 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run.yaml +++ b/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run.yaml @@ -40,7 +40,6 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-api/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-api/run.yaml index b742982db..ed8286e1d 100644 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-api/run.yaml +++ b/playbooks/legacy/neutron-lbaasv2-dsvm-api/run.yaml @@ -40,7 +40,6 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/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/neutron-lbaasv2-dsvm-healthmonitor/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/run.yaml deleted file mode 100644 index c6c6a0582..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-neutron-lbaasv2-dsvm-healthmonitor from old job gate-neutron-lbaasv2-dsvm-healthmonitor-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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - 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 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - function gate_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 healthmonitor - } - export -f gate_hook - - function post_test_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 healthmonitor - } - 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/neutron-lbaasv2-dsvm-listener/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-listener/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-listener/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/neutron-lbaasv2-dsvm-listener/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-listener/run.yaml deleted file mode 100644 index 053de8176..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-listener/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-neutron-lbaasv2-dsvm-listener from old job gate-neutron-lbaasv2-dsvm-listener-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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - 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 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - function gate_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 listener - } - export -f gate_hook - - function post_test_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 listener - } - 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/neutron-lbaasv2-dsvm-loadbalancer/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/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/neutron-lbaasv2-dsvm-loadbalancer/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/run.yaml deleted file mode 100644 index 00f0f7c6d..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-neutron-lbaasv2-dsvm-loadbalancer from old job gate-neutron-lbaasv2-dsvm-loadbalancer-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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - 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 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - function gate_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 loadbalancer - } - export -f gate_hook - - function post_test_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 loadbalancer - } - 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/neutron-lbaasv2-dsvm-member/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-member/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-member/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/neutron-lbaasv2-dsvm-member/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-member/run.yaml deleted file mode 100644 index 001c1e306..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-member/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-neutron-lbaasv2-dsvm-member from old job gate-neutron-lbaasv2-dsvm-member-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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - 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 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - function gate_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 member - } - export -f gate_hook - - function post_test_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 member - } - 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/neutron-lbaasv2-dsvm-minimal/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/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/neutron-lbaasv2-dsvm-minimal/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/run.yaml deleted file mode 100644 index b709bf0bb..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-neutron-lbaasv2-dsvm-minimal from old job gate-neutron-lbaasv2-dsvm-minimal-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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - 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 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - function gate_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 minimal - } - export -f gate_hook - - function post_test_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 minimal - } - 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/neutron-lbaasv2-dsvm-pool/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-pool/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-pool/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/neutron-lbaasv2-dsvm-pool/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-pool/run.yaml deleted file mode 100644 index eb9979dc8..000000000 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-pool/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-neutron-lbaasv2-dsvm-pool from old job gate-neutron-lbaasv2-dsvm-pool-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 DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - 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 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - function gate_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 pool - } - export -f gate_hook - - function post_test_hook { - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 pool - } - 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/neutron-lbaasv2-dsvm-py3x-api-namespace/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/run.yaml index 9a2fa968e..3b1946e04 100644 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/run.yaml +++ b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/run.yaml @@ -42,7 +42,6 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run.yaml index 97726b09a..30b48e065 100644 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run.yaml +++ b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run.yaml @@ -41,7 +41,6 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run.yaml index 8d715e5ef..145941997 100644 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run.yaml +++ b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run.yaml @@ -42,7 +42,6 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run.yaml index d3e661a5e..4a7309ece 100644 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run.yaml +++ b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run.yaml @@ -41,7 +41,6 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run.yaml index 208872757..378e334dc 100644 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run.yaml +++ b/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run.yaml @@ -41,7 +41,6 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run.yaml index 35064e20a..364ab47af 100644 --- a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run.yaml +++ b/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run.yaml @@ -40,7 +40,6 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" diff --git a/tools/tox_install.sh b/tools/tox_install.sh index c09d81872..946230554 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -17,6 +17,7 @@ ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner BRANCH_NAME=master neutron_installed=$(echo "import neutron" | python 2>/dev/null ; echo $?) NEUTRON_DIR=$HOME/neutron +local ZUULV3_PROJECT_DIR=$HOME/src/git.openstack.org/openstack/$project set -e set -x @@ -31,7 +32,10 @@ shift # Note that the functional tests use sudo to run tox and thus # variables used for zuul-cloner to check out the correct version are # lost. -if [ -d "$NEUTRON_DIR" ]; then +if [ -d "$ZUULV3_PROJECT_DIR" ]; then + echo "FOUND Neutron code at $ZUULV3_PROJECT_DIR - using" + $install_cmd -U -e $ZUULV3_PROJECT_DIR +elif [ -d "$NEUTRON_DIR" ]; then echo "FOUND Neutron code at $NEUTRON_DIR - using" $install_cmd -U -e $NEUTRON_DIR elif [ $neutron_installed -eq 0 ]; then diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 6a0781aa0..12b018aec 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -12,7 +12,6 @@ - openstack/neutron-lbaas - openstack/octavia - openstack/python-barbicanclient - - openstack/tripleo-image-elements - job: name: neutron-lbaasv2-dsvm-py3x-api @@ -28,7 +27,6 @@ - openstack/neutron-lbaas - openstack/octavia - openstack/python-barbicanclient - - openstack/tripleo-image-elements - job: name: neutron-lbaasv2-dsvm-api-namespace @@ -44,7 +42,6 @@ - openstack/neutron-lbaas - openstack/octavia - openstack/python-barbicanclient - - openstack/tripleo-image-elements - job: name: neutron-lbaasv2-dsvm-py3x-api-namespace @@ -60,103 +57,6 @@ - openstack/neutron-lbaas - openstack/octavia - openstack/python-barbicanclient - - openstack/tripleo-image-elements - -- job: - name: neutron-lbaasv2-dsvm-minimal - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-lbaasv2-dsvm-minimal/run.yaml - post-run: playbooks/legacy/neutron-lbaasv2-dsvm-minimal/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/tripleo-image-elements - -- job: - name: neutron-lbaasv2-dsvm-loadbalancer - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/run.yaml - post-run: playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/tripleo-image-elements - -- job: - name: neutron-lbaasv2-dsvm-listener - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-lbaasv2-dsvm-listener/run.yaml - post-run: playbooks/legacy/neutron-lbaasv2-dsvm-listener/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/tripleo-image-elements - -- job: - name: neutron-lbaasv2-dsvm-pool - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-lbaasv2-dsvm-pool/run.yaml - post-run: playbooks/legacy/neutron-lbaasv2-dsvm-pool/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/tripleo-image-elements - -- job: - name: neutron-lbaasv2-dsvm-member - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-lbaasv2-dsvm-member/run.yaml - post-run: playbooks/legacy/neutron-lbaasv2-dsvm-member/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/tripleo-image-elements - -- job: - name: neutron-lbaasv2-dsvm-healthmonitor - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/run.yaml - post-run: playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/tripleo-image-elements - job: name: neutron-lbaasv2-dsvm-scenario @@ -172,7 +72,6 @@ - openstack/neutron-lbaas - openstack/octavia - openstack/python-barbicanclient - - openstack/tripleo-image-elements - job: name: neutron-lbaasv2-dsvm-py3x-scenario @@ -188,7 +87,6 @@ - openstack/neutron-lbaas - openstack/octavia - openstack/python-barbicanclient - - openstack/tripleo-image-elements - job: name: neutron-lbaasv2-dsvm-scenario-namespace @@ -204,7 +102,6 @@ - openstack/neutron-lbaas - openstack/octavia - openstack/python-barbicanclient - - openstack/tripleo-image-elements - job: name: neutron-lbaasv2-dsvm-py3x-scenario-namespace @@ -220,4 +117,3 @@ - openstack/neutron-lbaas - openstack/octavia - openstack/python-barbicanclient - - openstack/tripleo-image-elements diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 683668819..528f8ef31 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -2,56 +2,30 @@ name: openstack/neutron-lbaas check: jobs: - - neutron-lbaasv2-dsvm-api: - branches: ^(?!stable/newton).*$ + - neutron-lbaasv2-dsvm-api - neutron-lbaasv2-dsvm-py3x-api: - branches: ^(?!stable) + branches: ^(?!stable/ocata).*$ - neutron-lbaasv2-dsvm-api-namespace - neutron-lbaasv2-dsvm-py3x-api-namespace: - branches: ^(?!stable) - - neutron-lbaasv2-dsvm-minimal: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-loadbalancer: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-listener: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-pool: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-member: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-healthmonitor: - branches: ^stable/newton + branches: ^(?!stable/ocata).*$ - neutron-lbaasv2-dsvm-scenario - neutron-lbaasv2-dsvm-py3x-scenario: - branches: ^(?!stable) + branches: ^(?!stable/ocata).*$ - neutron-lbaasv2-dsvm-scenario-namespace - neutron-lbaasv2-dsvm-py3x-scenario-namespace: - branches: ^(?!stable) + branches: ^(?!stable/ocata).*$ gate: queue: neutron-lbaas jobs: - - neutron-lbaasv2-dsvm-api: - branches: ^(?!stable/newton).*$ - - neutron-lbaasv2-dsvm-minimal: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-loadbalancer: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-listener: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-pool: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-member: - branches: ^stable/newton - - neutron-lbaasv2-dsvm-healthmonitor: - branches: ^stable/newton + - neutron-lbaasv2-dsvm-api - neutron-lbaasv2-dsvm-py3x-api: - branches: ^(?!stable) + branches: ^(?!stable/ocata).*$ - neutron-lbaasv2-dsvm-api-namespace - neutron-lbaasv2-dsvm-py3x-api-namespace: - branches: ^(?!stable) + branches: ^(?!stable/ocata).*$ - neutron-lbaasv2-dsvm-scenario - neutron-lbaasv2-dsvm-py3x-scenario: - branches: ^(?!stable) + branches: ^(?!stable/ocata).*$ - neutron-lbaasv2-dsvm-scenario-namespace - neutron-lbaasv2-dsvm-py3x-scenario-namespace: - branches: ^(?!stable) + branches: ^(?!stable/ocata).*$