From b7b6a10a164782eb6eccfd982d0e57cc86401978 Mon Sep 17 00:00:00 2001 From: ricolin Date: Mon, 23 Oct 2017 18:29:21 +0800 Subject: [PATCH] Remove legacy jobs for heat jobs to be remove: rally and triple-ci relative jobs. Depends-On: Ie080d74e54850f2d892b23ebd5e0412b0d139199 Depends-On: I0e6d7c4c7e80d0bb593c8c79a60eb111f61e5229 Change-Id: I2c6c9946d69ab099c28e91be0d0338c40c851567 --- .../grenade-dsvm-heat-multinode/post.yaml | 15 -- .../grenade-dsvm-heat-multinode/run.yaml | 66 -------- playbooks/legacy/grenade-dsvm-heat/post.yaml | 15 -- playbooks/legacy/grenade-dsvm-heat/run.yaml | 66 -------- .../post.yaml | 15 -- .../run.yaml | 133 --------------- .../post.yaml | 15 -- .../run.yaml | 133 --------------- .../post.yaml | 15 -- .../run.yaml | 133 --------------- .../post.yaml | 15 -- .../run.yaml | 133 --------------- .../post.yaml | 15 -- .../run.yaml | 133 --------------- .../post.yaml | 15 -- .../run.yaml | 133 --------------- zuul.d/zuul-legacy-jobs.yaml | 155 ------------------ 17 files changed, 1205 deletions(-) delete mode 100644 playbooks/legacy/grenade-dsvm-heat-multinode/post.yaml delete mode 100644 playbooks/legacy/grenade-dsvm-heat-multinode/run.yaml delete mode 100644 playbooks/legacy/grenade-dsvm-heat/post.yaml delete mode 100644 playbooks/legacy/grenade-dsvm-heat/run.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/post.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/run.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/post.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/run.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/post.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/run.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-py35/post.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-py35/run.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2/post.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2/run.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-orig-mysql-lbaasv2/post.yaml delete mode 100644 playbooks/legacy/heat-dsvm-functional-orig-mysql-lbaasv2/run.yaml diff --git a/playbooks/legacy/grenade-dsvm-heat-multinode/post.yaml b/playbooks/legacy/grenade-dsvm-heat-multinode/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/grenade-dsvm-heat-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/grenade-dsvm-heat-multinode/run.yaml b/playbooks/legacy/grenade-dsvm-heat-multinode/run.yaml deleted file mode 100644 index 5324a790..00000000 --- a/playbooks/legacy/grenade-dsvm-heat-multinode/run.yaml +++ /dev/null @@ -1,66 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-grenade-dsvm-heat-multinode from old job gate-grenade-dsvm-heat-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 heat git://git.openstack.org/openstack/heat - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack-dev/grenade $PROJECTS" - export PYTHONUNBUFFERED=true - export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat" - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_GRENADE=pullup - export BRANCH_OVERRIDE=default - export TOPOLOGY=-multinode - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - # Default topology is all-in-one (aio) - if [ "$TOPOLOGY" == "-multinode" ] ; then - export DEVSTACK_GATE_TOPOLOGY="multinode" - 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/grenade-dsvm-heat/post.yaml b/playbooks/legacy/grenade-dsvm-heat/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/grenade-dsvm-heat/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/grenade-dsvm-heat/run.yaml b/playbooks/legacy/grenade-dsvm-heat/run.yaml deleted file mode 100644 index 5d9a9b2f..00000000 --- a/playbooks/legacy/grenade-dsvm-heat/run.yaml +++ /dev/null @@ -1,66 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-grenade-dsvm-heat from old job gate-grenade-dsvm-heat-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 heat git://git.openstack.org/openstack/heat - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack-dev/grenade $PROJECTS" - export PYTHONUNBUFFERED=true - export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat" - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_GRENADE=pullup - export BRANCH_OVERRIDE=default - export TOPOLOGY= - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - # Default topology is all-in-one (aio) - if [ "$TOPOLOGY" == "-multinode" ] ; then - export DEVSTACK_GATE_TOPOLOGY="multinode" - 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/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/post.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/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/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/run.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/run.yaml deleted file mode 100644 index 378fa89a..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/run.yaml +++ /dev/null @@ -1,133 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-heat-dsvm-functional-convg-mysql-lbaasv2-amqp1 from - old job gate-heat-dsvm-functional-convg-mysql-lbaasv2-amqp1-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 - export PYTHONUNBUFFERED=true - services=rabbit,tempest,mysql,dstat,key - services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt - - # placement services mandatory for nova from ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - services+=,placement-api,placement-client - fi - - services+=,g-api,g-reg - services+=,c-sch,c-api,c-vol,c-bak - services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3 - - if [ "-amqp1" == "-py35" ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - # Swift does not work so skip s-* for python3x for now - else - export DEVSTACK_GATE_USE_PYTHON3=False - services+=,s-proxy,s-object,s-container,s-account - fi - - if [[ ! "stable/newton stable/ocata" =~ $ZUUL_BRANCH ]]; then - services+=,q-trunk - fi - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_PROJECT_FROM_GIT=python-heatclient - export KEEP_LOCALRC=1 - export PROJECTS="openstack/ceilometer $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/zaqar $PROJECTS" - export PROJECTS="openstack/python-zaqarclient $PROJECTS" - export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - - if [ "lbaasv2" = "lbaasv2" ]; then - # Enable LBaaS V2 plugin - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" - # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it - services+=,q-lbaasv2 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican" - # the lbaas v2 driver choice is in the gate pre test hook - else - services+=,q-lbaas - fi - - export OVERRIDE_ENABLED_SERVICES=$services - - if [ "mysql" == "postgres" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - - if [ "convg" == "orig" ] ; then - export DISABLE_CONVERGENCE=true - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "-amqp1" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" - fi - if [ "-amqp1" == "-non-apache" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False" - fi - if [ "-amqp1" == "-amqp1" ] ; then - export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export CELLSV2_SETUP=singleconductor" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging,$DEVSTACK_PROJECT_FROM_GIT" - fi - function pre_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./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/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/post.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/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/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/run.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/run.yaml deleted file mode 100644 index 73948502..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/run.yaml +++ /dev/null @@ -1,133 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only - from old job gate-heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only-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 - export PYTHONUNBUFFERED=true - services=rabbit,tempest,mysql,dstat,key - services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt - - # placement services mandatory for nova from ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - services+=,placement-api,placement-client - fi - - services+=,g-api,g-reg - services+=,c-sch,c-api,c-vol,c-bak - services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3 - - if [ "-identity-v3-only" == "-py35" ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - # Swift does not work so skip s-* for python3x for now - else - export DEVSTACK_GATE_USE_PYTHON3=False - services+=,s-proxy,s-object,s-container,s-account - fi - - if [[ ! "stable/newton stable/ocata" =~ $ZUUL_BRANCH ]]; then - services+=,q-trunk - fi - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_PROJECT_FROM_GIT=python-heatclient - export KEEP_LOCALRC=1 - export PROJECTS="openstack/ceilometer $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/zaqar $PROJECTS" - export PROJECTS="openstack/python-zaqarclient $PROJECTS" - export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - - if [ "lbaasv2" = "lbaasv2" ]; then - # Enable LBaaS V2 plugin - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" - # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it - services+=,q-lbaasv2 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican" - # the lbaas v2 driver choice is in the gate pre test hook - else - services+=,q-lbaas - fi - - export OVERRIDE_ENABLED_SERVICES=$services - - if [ "mysql" == "postgres" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - - if [ "convg" == "orig" ] ; then - export DISABLE_CONVERGENCE=true - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "-identity-v3-only" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" - fi - if [ "-identity-v3-only" == "-non-apache" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False" - fi - if [ "-identity-v3-only" == "-amqp1" ] ; then - export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export CELLSV2_SETUP=singleconductor" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging,$DEVSTACK_PROJECT_FROM_GIT" - fi - function pre_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./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/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/post.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/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/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/run.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/run.yaml deleted file mode 100644 index 8fed543d..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/run.yaml +++ /dev/null @@ -1,133 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-heat-dsvm-functional-convg-mysql-lbaasv2-non-apache - from old job gate-heat-dsvm-functional-convg-mysql-lbaasv2-non-apache-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 - services=rabbit,tempest,mysql,dstat,key - services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt - - # placement services mandatory for nova from ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - services+=,placement-api,placement-client - fi - - services+=,g-api,g-reg - services+=,c-sch,c-api,c-vol,c-bak - services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3 - - if [ "-non-apache" == "-py35" ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - # Swift does not work so skip s-* for python3x for now - else - export DEVSTACK_GATE_USE_PYTHON3=False - services+=,s-proxy,s-object,s-container,s-account - fi - - if [[ ! "stable/newton stable/ocata" =~ $ZUUL_BRANCH ]]; then - services+=,q-trunk - fi - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_PROJECT_FROM_GIT=python-heatclient - export KEEP_LOCALRC=1 - export PROJECTS="openstack/ceilometer $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/zaqar $PROJECTS" - export PROJECTS="openstack/python-zaqarclient $PROJECTS" - export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - - if [ "lbaasv2" = "lbaasv2" ]; then - # Enable LBaaS V2 plugin - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" - # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it - services+=,q-lbaasv2 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican" - # the lbaas v2 driver choice is in the gate pre test hook - else - services+=,q-lbaas - fi - - export OVERRIDE_ENABLED_SERVICES=$services - - if [ "mysql" == "postgres" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - - if [ "convg" == "orig" ] ; then - export DISABLE_CONVERGENCE=true - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "-non-apache" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" - fi - if [ "-non-apache" == "-non-apache" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False" - fi - if [ "-non-apache" == "-amqp1" ] ; then - export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export CELLSV2_SETUP=singleconductor" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging,$DEVSTACK_PROJECT_FROM_GIT" - fi - function pre_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./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/heat-dsvm-functional-convg-mysql-lbaasv2-py35/post.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-py35/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-py35/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/heat-dsvm-functional-convg-mysql-lbaasv2-py35/run.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-py35/run.yaml deleted file mode 100644 index 678bc75d..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-py35/run.yaml +++ /dev/null @@ -1,133 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-heat-dsvm-functional-convg-mysql-lbaasv2-py35 from - old job gate-heat-dsvm-functional-convg-mysql-lbaasv2-py35-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 - services=rabbit,tempest,mysql,dstat,key - services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt - - # placement services mandatory for nova from ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - services+=,placement-api,placement-client - fi - - services+=,g-api,g-reg - services+=,c-sch,c-api,c-vol,c-bak - services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3 - - if [ "-py35" == "-py35" ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - # Swift does not work so skip s-* for python3x for now - else - export DEVSTACK_GATE_USE_PYTHON3=False - services+=,s-proxy,s-object,s-container,s-account - fi - - if [[ ! "stable/newton stable/ocata" =~ $ZUUL_BRANCH ]]; then - services+=,q-trunk - fi - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_PROJECT_FROM_GIT=python-heatclient - export KEEP_LOCALRC=1 - export PROJECTS="openstack/ceilometer $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/zaqar $PROJECTS" - export PROJECTS="openstack/python-zaqarclient $PROJECTS" - export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - - if [ "lbaasv2" = "lbaasv2" ]; then - # Enable LBaaS V2 plugin - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" - # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it - services+=,q-lbaasv2 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican" - # the lbaas v2 driver choice is in the gate pre test hook - else - services+=,q-lbaas - fi - - export OVERRIDE_ENABLED_SERVICES=$services - - if [ "mysql" == "postgres" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - - if [ "convg" == "orig" ] ; then - export DISABLE_CONVERGENCE=true - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "-py35" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" - fi - if [ "-py35" == "-non-apache" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False" - fi - if [ "-py35" == "-amqp1" ] ; then - export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export CELLSV2_SETUP=singleconductor" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging,$DEVSTACK_PROJECT_FROM_GIT" - fi - function pre_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./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/heat-dsvm-functional-convg-mysql-lbaasv2/post.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2/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/heat-dsvm-functional-convg-mysql-lbaasv2/run.yaml b/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2/run.yaml deleted file mode 100644 index 16477ad0..00000000 --- a/playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2/run.yaml +++ /dev/null @@ -1,133 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-heat-dsvm-functional-convg-mysql-lbaasv2 from old - job gate-heat-dsvm-functional-convg-mysql-lbaasv2-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 - services=rabbit,tempest,mysql,dstat,key - services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt - - # placement services mandatory for nova from ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - services+=,placement-api,placement-client - fi - - services+=,g-api,g-reg - services+=,c-sch,c-api,c-vol,c-bak - services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3 - - if [ "" == "-py35" ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - # Swift does not work so skip s-* for python3x for now - else - export DEVSTACK_GATE_USE_PYTHON3=False - services+=,s-proxy,s-object,s-container,s-account - fi - - if [[ ! "stable/newton stable/ocata" =~ $ZUUL_BRANCH ]]; then - services+=,q-trunk - fi - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_PROJECT_FROM_GIT=python-heatclient - export KEEP_LOCALRC=1 - export PROJECTS="openstack/ceilometer $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/zaqar $PROJECTS" - export PROJECTS="openstack/python-zaqarclient $PROJECTS" - export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - - if [ "lbaasv2" = "lbaasv2" ]; then - # Enable LBaaS V2 plugin - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" - # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it - services+=,q-lbaasv2 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican" - # the lbaas v2 driver choice is in the gate pre test hook - else - services+=,q-lbaas - fi - - export OVERRIDE_ENABLED_SERVICES=$services - - if [ "mysql" == "postgres" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - - if [ "convg" == "orig" ] ; then - export DISABLE_CONVERGENCE=true - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" - fi - if [ "" == "-non-apache" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False" - fi - if [ "" == "-amqp1" ] ; then - export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export CELLSV2_SETUP=singleconductor" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging,$DEVSTACK_PROJECT_FROM_GIT" - fi - function pre_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./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/heat-dsvm-functional-orig-mysql-lbaasv2/post.yaml b/playbooks/legacy/heat-dsvm-functional-orig-mysql-lbaasv2/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/heat-dsvm-functional-orig-mysql-lbaasv2/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/heat-dsvm-functional-orig-mysql-lbaasv2/run.yaml b/playbooks/legacy/heat-dsvm-functional-orig-mysql-lbaasv2/run.yaml deleted file mode 100644 index fac4d5e2..00000000 --- a/playbooks/legacy/heat-dsvm-functional-orig-mysql-lbaasv2/run.yaml +++ /dev/null @@ -1,133 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-heat-dsvm-functional-orig-mysql-lbaasv2 from old - job gate-heat-dsvm-functional-orig-mysql-lbaasv2-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 - services=rabbit,tempest,mysql,dstat,key - services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt - - # placement services mandatory for nova from ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - services+=,placement-api,placement-client - fi - - services+=,g-api,g-reg - services+=,c-sch,c-api,c-vol,c-bak - services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3 - - if [ "" == "-py35" ] ; then - export DEVSTACK_GATE_USE_PYTHON3=True - # Swift does not work so skip s-* for python3x for now - else - export DEVSTACK_GATE_USE_PYTHON3=False - services+=,s-proxy,s-object,s-container,s-account - fi - - if [[ ! "stable/newton stable/ocata" =~ $ZUUL_BRANCH ]]; then - services+=,q-trunk - fi - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_PROJECT_FROM_GIT=python-heatclient - export KEEP_LOCALRC=1 - export PROJECTS="openstack/ceilometer $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/zaqar $PROJECTS" - export PROJECTS="openstack/python-zaqarclient $PROJECTS" - export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - - if [ "lbaasv2" = "lbaasv2" ]; then - # Enable LBaaS V2 plugin - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" - # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it - services+=,q-lbaasv2 - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican" - # the lbaas v2 driver choice is in the gate pre test hook - else - services+=,q-lbaas - fi - - export OVERRIDE_ENABLED_SERVICES=$services - - if [ "mysql" == "postgres" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - - if [ "orig" == "orig" ] ; then - export DISABLE_CONVERGENCE=true - fi - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "" == "-identity-v3-only" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" - fi - if [ "" == "-non-apache" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False" - fi - if [ "" == "-amqp1" ] ; then - export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export CELLSV2_SETUP=singleconductor" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging,$DEVSTACK_PROJECT_FROM_GIT" - fi - function pre_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - cd /opt/stack/new/heat/heat_integrationtests - source ./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 71b94b7e..f76e667f 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -1286,29 +1286,6 @@ - openstack/python-designateclient branches: ^(?!stable/ocata).*$ -- job: - name: legacy-grenade-dsvm-heat - parent: legacy-dsvm-base - run: playbooks/legacy/grenade-dsvm-heat/run.yaml - post-run: playbooks/legacy/grenade-dsvm-heat/post.yaml - timeout: 7800 - required-projects: - - openstack-dev/grenade - - openstack-infra/devstack-gate - - openstack/heat - -- job: - name: legacy-grenade-dsvm-heat-multinode - parent: legacy-dsvm-base-multinode - run: playbooks/legacy/grenade-dsvm-heat-multinode/run.yaml - post-run: playbooks/legacy/grenade-dsvm-heat-multinode/post.yaml - timeout: 7800 - required-projects: - - openstack-dev/grenade - - openstack-infra/devstack-gate - - openstack/heat - nodeset: legacy-ubuntu-xenial-2-node - - job: name: legacy-grenade-dsvm-mongodb-zaqar parent: legacy-dsvm-base @@ -1636,138 +1613,6 @@ run: playbooks/legacy/hacking-integration-nova/run.yaml timeout: 1800 -- job: - name: legacy-heat-dsvm-functional-convg-mysql-lbaasv2 - parent: legacy-dsvm-base - run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2/run.yaml - post-run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/aodh - - openstack/barbican - - openstack/barbican-tempest-plugin - - openstack/ceilometer - - openstack/devstack-plugin-amqp1 - - openstack/heat - - openstack/neutron - - openstack/neutron-lbaas - - openstack/oslo.messaging - - openstack/python-barbicanclient - - openstack/python-heatclient - - openstack/python-zaqarclient - - openstack/zaqar - -- job: - name: legacy-heat-dsvm-functional-convg-mysql-lbaasv2-amqp1 - parent: legacy-dsvm-base - run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/run.yaml - post-run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-amqp1/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/aodh - - openstack/barbican - - openstack/barbican-tempest-plugin - - openstack/ceilometer - - openstack/devstack-plugin-amqp1 - - openstack/heat - - openstack/neutron - - openstack/neutron-lbaas - - openstack/oslo.messaging - - openstack/python-barbicanclient - - openstack/python-heatclient - - openstack/python-zaqarclient - - openstack/zaqar - -- job: - name: legacy-heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only - parent: legacy-dsvm-base - run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/run.yaml - post-run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-identity-v3-only/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/aodh - - openstack/barbican - - openstack/barbican-tempest-plugin - - openstack/ceilometer - - openstack/devstack-plugin-amqp1 - - openstack/heat - - openstack/neutron - - openstack/neutron-lbaas - - openstack/oslo.messaging - - openstack/python-barbicanclient - - openstack/python-heatclient - - openstack/python-zaqarclient - - openstack/zaqar - -- job: - name: legacy-heat-dsvm-functional-convg-mysql-lbaasv2-non-apache - parent: legacy-dsvm-base - run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/run.yaml - post-run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-non-apache/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/aodh - - openstack/barbican - - openstack/barbican-tempest-plugin - - openstack/ceilometer - - openstack/devstack-plugin-amqp1 - - openstack/heat - - openstack/neutron - - openstack/neutron-lbaas - - openstack/oslo.messaging - - openstack/python-barbicanclient - - openstack/python-heatclient - - openstack/python-zaqarclient - - openstack/zaqar - -- job: - name: legacy-heat-dsvm-functional-convg-mysql-lbaasv2-py35 - parent: legacy-dsvm-base - run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-py35/run.yaml - post-run: playbooks/legacy/heat-dsvm-functional-convg-mysql-lbaasv2-py35/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/aodh - - openstack/barbican - - openstack/barbican-tempest-plugin - - openstack/ceilometer - - openstack/devstack-plugin-amqp1 - - openstack/heat - - openstack/neutron - - openstack/neutron-lbaas - - openstack/oslo.messaging - - openstack/python-barbicanclient - - openstack/python-heatclient - - openstack/python-zaqarclient - - openstack/zaqar - -- job: - name: legacy-heat-dsvm-functional-orig-mysql-lbaasv2 - parent: legacy-dsvm-base - run: playbooks/legacy/heat-dsvm-functional-orig-mysql-lbaasv2/run.yaml - post-run: playbooks/legacy/heat-dsvm-functional-orig-mysql-lbaasv2/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/aodh - - openstack/barbican - - openstack/barbican-tempest-plugin - - openstack/ceilometer - - openstack/devstack-plugin-amqp1 - - openstack/heat - - openstack/neutron - - openstack/neutron-lbaas - - openstack/oslo.messaging - - openstack/python-barbicanclient - - openstack/python-heatclient - - openstack/python-zaqarclient - - openstack/zaqar - - job: name: legacy-heat-templates-dsvm parent: legacy-dsvm-base