diff --git a/playbooks/legacy/senlin-dsvm-tempest-py27-api/post.yaml b/playbooks/legacy/senlin-dsvm-tempest-py27-api/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py27-api/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/senlin-dsvm-tempest-py27-api/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py27-api/run.yaml
deleted file mode 100644
index db319a81..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py27-api/run.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-senlin-dsvm-tempest-py27-api from old job gate-senlin-dsvm-tempest-py27-api
- 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_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 KEEP_LOCALRC=1
-
- if [ "py27" == "py35" ]; then
- export DEVSTACK_GATE_USE_PYTHON3=True
- else
- export DEVSTACK_GATE_USE_PYTHON3=False
- fi
-
- export DEVSTACK_GATE_TEMPEST_REGEX="senlin.tests.tempest.api"
-
- services=rabbit,mysql,dstat,key,tempest
- services+=,g-api,g-reg
- services+=,n-api,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+=,c-sch,c-api,c-vol,c-bak
- services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
- export PROJECTS="openstack/senlin $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
- if [ "api" == "api" ]||[ "api" == "functional" ]; then
- export SENLIN_BACKEND="openstack_test"
- else
- export SENLIN_BACKEND="openstack"
- export PROJECTS="openstack/heat $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
- # Enable LBaaS V2 plugin
- services+=,q-lbaasv2
- export PROJECTS="openstack/neutron-lbaas $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
-
- # Enable Zaqar
- export PROJECTS="openstack/zaqar $PROJECTS"
- export PROJECTS="openstack/python-zaqarclient $PROJECTS"
- export PROJECTS="openstack/zaqar-ui $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
- fi
-
- export OVERRIDE_ENABLED_SERVICES=$services
-
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function pre_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./pre_test_hook.sh
- }
- export -f pre_test_hook
-
- function post_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./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/senlin-dsvm-tempest-py27-functional/post.yaml b/playbooks/legacy/senlin-dsvm-tempest-py27-functional/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py27-functional/post.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-- hosts: primary
- tasks:
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=**/*nose_results.html
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=**/*testr_results.html.gz
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/.testrepository/tmp*
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=**/*testrepository.subunit.gz
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}/tox'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/.tox/*/log/*
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml
deleted file mode 100644
index 0037b9e9..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-senlin-dsvm-tempest-py27-functional from old job
- gate-senlin-dsvm-tempest-py27-functional
- 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_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 KEEP_LOCALRC=1
-
- if [ "py27" == "py35" ]; then
- export DEVSTACK_GATE_USE_PYTHON3=True
- else
- export DEVSTACK_GATE_USE_PYTHON3=False
- fi
-
- export DEVSTACK_GATE_TEMPEST_REGEX="senlin.tests.tempest.functional"
-
- services=rabbit,mysql,dstat,key,tempest
- services+=,g-api,g-reg
- services+=,n-api,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+=,c-sch,c-api,c-vol,c-bak
- services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
- export PROJECTS="openstack/senlin $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
- if [ "functional" == "api" ]||[ "functional" == "functional" ]; then
- export SENLIN_BACKEND="openstack_test"
- else
- export SENLIN_BACKEND="openstack"
- export PROJECTS="openstack/heat $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
- # Enable LBaaS V2 plugin
- services+=,q-lbaasv2
- export PROJECTS="openstack/neutron-lbaas $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
-
- # Enable Zaqar
- export PROJECTS="openstack/zaqar $PROJECTS"
- export PROJECTS="openstack/python-zaqarclient $PROJECTS"
- export PROJECTS="openstack/zaqar-ui $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
- fi
-
- export OVERRIDE_ENABLED_SERVICES=$services
-
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function pre_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./pre_test_hook.sh
- }
- export -f pre_test_hook
-
- function post_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./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/senlin-dsvm-tempest-py27-integration/post.yaml b/playbooks/legacy/senlin-dsvm-tempest-py27-integration/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py27-integration/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/senlin-dsvm-tempest-py27-integration/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py27-integration/run.yaml
deleted file mode 100644
index 0ba03b34..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py27-integration/run.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-senlin-dsvm-tempest-py27-integration from old job
- gate-senlin-dsvm-tempest-py27-integration-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
- 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 KEEP_LOCALRC=1
-
- if [ "py27" == "py35" ]; then
- export DEVSTACK_GATE_USE_PYTHON3=True
- else
- export DEVSTACK_GATE_USE_PYTHON3=False
- fi
-
- export DEVSTACK_GATE_TEMPEST_REGEX="senlin.tests.tempest.integration"
-
- services=rabbit,mysql,dstat,key,tempest
- services+=,g-api,g-reg
- services+=,n-api,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+=,c-sch,c-api,c-vol,c-bak
- services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
- export PROJECTS="openstack/senlin $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
- if [ "integration" == "api" ]||[ "integration" == "functional" ]; then
- export SENLIN_BACKEND="openstack_test"
- else
- export SENLIN_BACKEND="openstack"
- export PROJECTS="openstack/heat $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
- # Enable LBaaS V2 plugin
- services+=,q-lbaasv2
- export PROJECTS="openstack/neutron-lbaas $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
-
- # Enable Zaqar
- export PROJECTS="openstack/zaqar $PROJECTS"
- export PROJECTS="openstack/python-zaqarclient $PROJECTS"
- export PROJECTS="openstack/zaqar-ui $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
- fi
-
- export OVERRIDE_ENABLED_SERVICES=$services
-
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function pre_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./pre_test_hook.sh
- }
- export -f pre_test_hook
-
- function post_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./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/senlin-dsvm-tempest-py35-api/post.yaml b/playbooks/legacy/senlin-dsvm-tempest-py35-api/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py35-api/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/senlin-dsvm-tempest-py35-api/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py35-api/run.yaml
deleted file mode 100644
index 02684194..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py35-api/run.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-senlin-dsvm-tempest-py35-api from old job gate-senlin-dsvm-tempest-py35-api-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
- 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 KEEP_LOCALRC=1
-
- if [ "py35" == "py35" ]; then
- export DEVSTACK_GATE_USE_PYTHON3=True
- else
- export DEVSTACK_GATE_USE_PYTHON3=False
- fi
-
- export DEVSTACK_GATE_TEMPEST_REGEX="senlin.tests.tempest.api"
-
- services=rabbit,mysql,dstat,key,tempest
- services+=,g-api,g-reg
- services+=,n-api,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+=,c-sch,c-api,c-vol,c-bak
- services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
- export PROJECTS="openstack/senlin $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
- if [ "api" == "api" ]||[ "api" == "functional" ]; then
- export SENLIN_BACKEND="openstack_test"
- else
- export SENLIN_BACKEND="openstack"
- export PROJECTS="openstack/heat $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
- # Enable LBaaS V2 plugin
- services+=,q-lbaasv2
- export PROJECTS="openstack/neutron-lbaas $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
-
- # Enable Zaqar
- export PROJECTS="openstack/zaqar $PROJECTS"
- export PROJECTS="openstack/python-zaqarclient $PROJECTS"
- export PROJECTS="openstack/zaqar-ui $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
- fi
-
- export OVERRIDE_ENABLED_SERVICES=$services
-
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function pre_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./pre_test_hook.sh
- }
- export -f pre_test_hook
-
- function post_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./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/senlin-dsvm-tempest-py35-functional/post.yaml b/playbooks/legacy/senlin-dsvm-tempest-py35-functional/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py35-functional/post.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-- hosts: primary
- tasks:
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=**/*nose_results.html
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=**/*testr_results.html.gz
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/.testrepository/tmp*
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=**/*testrepository.subunit.gz
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}/tox'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/.tox/*/log/*
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml
deleted file mode 100644
index ae6f147f..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-senlin-dsvm-tempest-py35-functional from old job
- gate-senlin-dsvm-tempest-py35-functional-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
- 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 KEEP_LOCALRC=1
-
- if [ "py35" == "py35" ]; then
- export DEVSTACK_GATE_USE_PYTHON3=True
- else
- export DEVSTACK_GATE_USE_PYTHON3=False
- fi
-
- export DEVSTACK_GATE_TEMPEST_REGEX="senlin.tests.tempest.functional"
-
- services=rabbit,mysql,dstat,key,tempest
- services+=,g-api,g-reg
- services+=,n-api,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+=,c-sch,c-api,c-vol,c-bak
- services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
- export PROJECTS="openstack/senlin $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
- if [ "functional" == "api" ]||[ "functional" == "functional" ]; then
- export SENLIN_BACKEND="openstack_test"
- else
- export SENLIN_BACKEND="openstack"
- export PROJECTS="openstack/heat $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
- # Enable LBaaS V2 plugin
- services+=,q-lbaasv2
- export PROJECTS="openstack/neutron-lbaas $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
-
- # Enable Zaqar
- export PROJECTS="openstack/zaqar $PROJECTS"
- export PROJECTS="openstack/python-zaqarclient $PROJECTS"
- export PROJECTS="openstack/zaqar-ui $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
- fi
-
- export OVERRIDE_ENABLED_SERVICES=$services
-
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function pre_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./pre_test_hook.sh
- }
- export -f pre_test_hook
-
- function post_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./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/senlin-dsvm-tempest-py35-integration/post.yaml b/playbooks/legacy/senlin-dsvm-tempest-py35-integration/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py35-integration/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/senlin-dsvm-tempest-py35-integration/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py35-integration/run.yaml
deleted file mode 100644
index 0b45469c..00000000
--- a/playbooks/legacy/senlin-dsvm-tempest-py35-integration/run.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-senlin-dsvm-tempest-py35-integration from old job
- gate-senlin-dsvm-tempest-py35-integration-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
- 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 KEEP_LOCALRC=1
-
- if [ "py35" == "py35" ]; then
- export DEVSTACK_GATE_USE_PYTHON3=True
- else
- export DEVSTACK_GATE_USE_PYTHON3=False
- fi
-
- export DEVSTACK_GATE_TEMPEST_REGEX="senlin.tests.tempest.integration"
-
- services=rabbit,mysql,dstat,key,tempest
- services+=,g-api,g-reg
- services+=,n-api,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+=,c-sch,c-api,c-vol,c-bak
- services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
-
- export PROJECTS="openstack/senlin $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-
- if [ "integration" == "api" ]||[ "integration" == "functional" ]; then
- export SENLIN_BACKEND="openstack_test"
- else
- export SENLIN_BACKEND="openstack"
- export PROJECTS="openstack/heat $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
- # Enable LBaaS V2 plugin
- services+=,q-lbaasv2
- export PROJECTS="openstack/neutron-lbaas $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
-
- # Enable Zaqar
- export PROJECTS="openstack/zaqar $PROJECTS"
- export PROJECTS="openstack/python-zaqarclient $PROJECTS"
- export PROJECTS="openstack/zaqar-ui $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
- fi
-
- export OVERRIDE_ENABLED_SERVICES=$services
-
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function pre_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./pre_test_hook.sh
- }
- export -f pre_test_hook
-
- function post_test_hook {
- cd /opt/stack/new/senlin/senlin/tests/tempest/
- ./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 b2059722..27fbc31b 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -10225,102 +10225,6 @@
post-run: playbooks/legacy/senlin-dashboard-nodejs4-npm-run-test/post
timeout: 2400
-- job:
- name: legacy-senlin-dsvm-tempest-py27-api
- parent: legacy-dsvm-base
- run: playbooks/legacy/senlin-dsvm-tempest-py27-api/run
- post-run: playbooks/legacy/senlin-dsvm-tempest-py27-api/post
- timeout: 7800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/heat
- - openstack/neutron-lbaas
- - openstack/python-zaqarclient
- - openstack/senlin
- - openstack/tempest
- - openstack/zaqar
- - openstack/zaqar-ui
-
-- job:
- name: legacy-senlin-dsvm-tempest-py27-functional
- parent: legacy-dsvm-base
- run: playbooks/legacy/senlin-dsvm-tempest-py27-functional/run
- post-run: playbooks/legacy/senlin-dsvm-tempest-py27-functional/post
- timeout: 7800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/heat
- - openstack/neutron-lbaas
- - openstack/python-zaqarclient
- - openstack/senlin
- - openstack/tempest
- - openstack/zaqar
- - openstack/zaqar-ui
-
-- job:
- name: legacy-senlin-dsvm-tempest-py27-integration
- parent: legacy-dsvm-base
- run: playbooks/legacy/senlin-dsvm-tempest-py27-integration/run
- post-run: playbooks/legacy/senlin-dsvm-tempest-py27-integration/post
- timeout: 7800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/heat
- - openstack/neutron-lbaas
- - openstack/python-zaqarclient
- - openstack/senlin
- - openstack/tempest
- - openstack/zaqar
- - openstack/zaqar-ui
-
-- job:
- name: legacy-senlin-dsvm-tempest-py35-api
- parent: legacy-dsvm-base
- run: playbooks/legacy/senlin-dsvm-tempest-py35-api/run
- post-run: playbooks/legacy/senlin-dsvm-tempest-py35-api/post
- timeout: 7800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/heat
- - openstack/neutron-lbaas
- - openstack/python-zaqarclient
- - openstack/senlin
- - openstack/tempest
- - openstack/zaqar
- - openstack/zaqar-ui
-
-- job:
- name: legacy-senlin-dsvm-tempest-py35-functional
- parent: legacy-dsvm-base
- run: playbooks/legacy/senlin-dsvm-tempest-py35-functional/run
- post-run: playbooks/legacy/senlin-dsvm-tempest-py35-functional/post
- timeout: 7800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/heat
- - openstack/neutron-lbaas
- - openstack/python-zaqarclient
- - openstack/senlin
- - openstack/tempest
- - openstack/zaqar
- - openstack/zaqar-ui
-
-- job:
- name: legacy-senlin-dsvm-tempest-py35-integration
- parent: legacy-dsvm-base
- run: playbooks/legacy/senlin-dsvm-tempest-py35-integration/run
- post-run: playbooks/legacy/senlin-dsvm-tempest-py35-integration/post
- timeout: 7800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/heat
- - openstack/neutron-lbaas
- - openstack/python-zaqarclient
- - openstack/senlin
- - openstack/tempest
- - openstack/zaqar
- - openstack/zaqar-ui
-
- job:
name: legacy-senlinclient-dsvm-functional
parent: legacy-dsvm-base