diff options
| author | Zhao Chao <zhaochao1984@gmail.com> | 2018-05-07 23:08:49 +0800 |
|---|---|---|
| committer | Zhao Chao <zhaochao1984@gmail.com> | 2018-07-17 10:29:55 +0800 |
| commit | d2868a59cba6e4cda68eade5c16d5aabdde5a64d (patch) | |
| tree | 8be7467c0495326a9597921f1ec6d47dae5898d8 | |
| parent | 87fd1c4b0ec1f0788c0e0478acf80e7e280c16a4 (diff) | |
| download | trove-d2868a59cba6e4cda68eade5c16d5aabdde5a64d.tar.gz | |
Migrate to Zuul v3 native job definitions
This patch migrates the legacy gate jobs to Zuul v3 native ones(a new
trove-devstack role is created for all those legecy jobs, and the
previous way of running gate jobs is still kept as we still cannot
migrate the genade job to a Zuul v3 native one), following the
documents below:
https://docs.openstack.org/infra/manual/zuulv3.html
https://docs.openstack.org/devstack/latest/zuul_ci_jobs_migration.html
Change-Id: I10a1adae3a79b7322118fce180119f0ee5ff2e1b
Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>
45 files changed, 168 insertions, 1730 deletions
@@ -69,6 +69,46 @@ - ^trove/tests/unittests/.*$ - job: + name: trove-devstack-base + parent: devstack + abstract: true + timeout: 10800 + required-projects: + - openstack/tempest + - openstack/diskimage-builder + - openstack/python-troveclient + - openstack/tripleo-image-elements + - openstack/trove + - openstack/trove-dashboard + vars: + devstack_services: + tempest: true + tls-proxy: false + devstack_plugins: + trove: git://git.openstack.org/openstack/trove + # NOTE(zhaochao): we have to override the default settings from the + # the base devstack job about "SERVICE_HOST" and "HOST_IP", as trove + # guestagent should use public addresses to access the underlying + # components(MQ and Swift), and the previous devstack-gate jobs didn't + # set these variables. However we cannot unset variables in job + # definition, so we just set SERVICE_HOST and HOST_IP to empty strings, + # and VNCSERVER_PROXYCLIENT_ADDRESS to 127.0.0.1 instead. + devstack_localrc: + SERVICE_HOST: "" + HOST_IP: "" + VNCSERVER_PROXYCLIENT_ADDRESS: 127.0.0.1 + run: playbooks/trove-devstack-base.yaml + irrelevant-files: + - ^.*\.rst$ + - ^api-ref/.*$ + - ^apidocs/.*$ + - ^doc/.*$ + - ^releasenotes/.*$ + - ^tools/.*$ + - ^trove/hacking/.*$ + - ^trove/tests/unittests/.*$ + +- job: name: trove-fakemodetests-base parent: openstack-tox-py27 abstract: true @@ -89,9 +129,11 @@ - job: name: trove-functional-mysql - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-functional-dsvm-mysql/run.yaml - post-run: playbooks/legacy/trove-functional-dsvm-mysql/post.yaml + parent: trove-devstack-base + vars: + devstack_localrc: + TROVE_RESIZE_TIME_OUT: 1800 + trove_resize_time_out: 1800 - job: name: trove-grenade @@ -106,111 +148,128 @@ - job: name: trove-scenario-cassandra-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-cassandra-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: cassandra + trove_test_group: cassandra-supported-single - job: name: trove-scenario-cassandra-multi - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-cassandra-multi/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: cassandra + trove_test_group: cassandra-supported-multi - job: name: trove-scenario-couchdb-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-couchdb-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: couchdb + trove_test_group: couchdb-supported-single - job: name: trove-scenario-couchbase-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-couchbase-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: couchbase + trove_test_group: couchbase-supported-single - job: name: trove-scenario-mariadb-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-mariadb-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: mariadb + trove_test_group: mariadb-supported-single - job: name: trove-scenario-mariadb-multi - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-mariadb-multi/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: mariadb + trove_test_group: mariadb-supported-multi - job: name: trove-scenario-mongodb-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-mongodb-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: mongodb + trove_test_group: mongodb-supported-single - job: name: trove-scenario-mongodb-multi - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-mongodb-multi/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: mongodb + trove_test_group: mongodb-supported-multi - job: name: trove-scenario-mysql-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-mysql-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_group: mysql-supported-single - job: name: trove-scenario-mysql-multi - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-mysql-multi/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: mysql + trove_test_group: mysql-supported-single - job: name: trove-scenario-percona-multi - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-percona-multi/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: percona + trove_test_group: percona-supported-multi - job: name: trove-scenario-percona-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-percona-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: percona + trove_test_group: percona-supported-single - job: name: trove-scenario-postgresql-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-postgresql-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: postgresql + trove_test_group: postgresql-supported-single - job: name: trove-scenario-postgresql-multi - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-postgresql-multi/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: postgresql + trove_test_group: postgresql-supported-multi - job: name: trove-scenario-pxc-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-pxc-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: pxc + trove_test_group: pxc-supported-single - job: name: trove-scenario-pxc-multi - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-pxc-multi/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: pxc + trove_test_group: pxc-supported-multi - job: name: trove-scenario-redis-single - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-redis-single/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: redis + trove_test_group: redis-supported-single - job: name: trove-scenario-redis-multi - parent: trove-legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml - post-run: playbooks/legacy/trove-scenario-dsvm-redis-multi/post.yaml + parent: trove-devstack-base + vars: + trove_test_datastore: redis + trove_test_group: redis-supported-multi - job: name: trove-tox-fakemodetests diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index aa6e8302..1ae8782d 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -1293,7 +1293,7 @@ function cmd_kick_start() { cmd_build_and_upload_image "${DATASTORE_TYPE}" "${RESTART_TROVE}" } -function cmd_dsvm_gate_tests() { +function cmd_gate_tests() { ACTUAL_HOSTNAME=$(hostname -I | sed 's/[0-9a-z][0-9a-z]*:.*:[0-9a-z][0-9a-z]*//g' | sed 's/[0-9]*\.[0-9]*\.[0-9]*\.1\b//g' | sed 's/ /\n/g' | sed '/^$/d' | sort -bu | head -1) local DATASTORE_TYPE=${1:-'mysql'} @@ -1301,9 +1301,12 @@ function cmd_dsvm_gate_tests() { local HOST_SCP_USERNAME=${3:-$USER} local GUEST_USERNAME=${4:-'ubuntu'} local CONTROLLER_IP=${5:-$ACTUAL_HOSTNAME} - local ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'} + # We're not using devstack-gate in Zuul v3 job + if [[ $GATE_JOB_VER == "v2" ]]; then + local ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'} + fi - exclaim "Running cmd_dsvm_gate_tests ..." + exclaim "Running cmd_gate_tests ..." # Sometimes in the gate the ACTUAL_HOSTNAME is blank - this code attempts to debug it if [[ -z "${CONTROLLER_IP// }" ]]; then @@ -1333,8 +1336,8 @@ function cmd_dsvm_gate_tests() { echo "*** CONTROLLER_IP was blank (CONTROLLER_IP now set to '$CONTROLLER_IP')" fi - export REPORT_DIRECTORY=${REPORT_DIRECTORY:=$HOME/dsvm-report/} - export TROVE_REPORT_DIR=$HOME/dsvm-report/ + export REPORT_DIRECTORY=${REPORT_DIRECTORY:=$HOME/gate-tests-report/} + export TROVE_REPORT_DIR=$HOME/gate-tests-report/ TROVESTACK_DUMP_ENV=true # Devstack vm-gate runs as a non-ubuntu user, but needs to connect to the guest image as ubuntu @@ -1352,12 +1355,17 @@ function cmd_dsvm_gate_tests() { local RESTART_TROVE=false cmd_kick_start "${DATASTORE_TYPE}" "${RESTART_TROVE}" - # Update the local swift endpoint in the catalog to use the CONTROLLER_IP instead of 127.0.0.1 - SWIFT_ENDPOINTS=$(openstack $CLOUD_ADMIN_ARG endpoint list --service swift -c ID -f value) - openstack $CLOUD_ADMIN_ARG endpoint create swift public 'http://'$CONTROLLER_IP':8080/v1/AUTH_$(tenant_id)s' --region RegionOne - openstack $CLOUD_ADMIN_ARG endpoint create swift internal 'http://'$CONTROLLER_IP':8080/v1/AUTH_$(tenant_id)s' --region RegionOne - openstack $CLOUD_ADMIN_ARG endpoint create swift admin 'http://'$CONTROLLER_IP':8080' --region RegionOne - echo $SWIFT_ENDPOINTS | xargs -n 1 openstack $CLOUD_ADMIN_ARG endpoint delete + # TODO(zhaochao): in fact, devstack also use CONTROLLER_IP to construct the endpoint urls + # so we could safely remove the following lines in the future(they're kept now for not + # introducing too many changes. + if [[ $GATE_JOB_VER == "v2" ]]; then + # Update the local swift endpoint in the catalog to use the CONTROLLER_IP instead of 127.0.0.1 + SWIFT_ENDPOINTS=$(openstack $CLOUD_ADMIN_ARG endpoint list --service swift -c ID -f value) + openstack $CLOUD_ADMIN_ARG endpoint create swift public 'http://'$CONTROLLER_IP':8080/v1/AUTH_$(tenant_id)s' --region RegionOne + openstack $CLOUD_ADMIN_ARG endpoint create swift internal 'http://'$CONTROLLER_IP':8080/v1/AUTH_$(tenant_id)s' --region RegionOne + openstack $CLOUD_ADMIN_ARG endpoint create swift admin 'http://'$CONTROLLER_IP':8080' --region RegionOne + echo $SWIFT_ENDPOINTS | xargs -n 1 openstack $CLOUD_ADMIN_ARG endpoint delete + fi cmd_int_tests --group=$TEST_GROUP } @@ -1470,7 +1478,8 @@ function print_usage() { Run single Redis scenario tests: ./trovestack int-tests --group=redis-supported-single Run specific functional tests: ./trovestack int-tests --group=module-create --group=configuration-create simple-tests - Runs the simple integration tests (requires all daemons). - dsvm-gate-tests - Configures and runs the int-tests in a devstack vm-gate environment. + dsvm-gate-tests - Configures and runs the int-tests in a devstack vm-gate environment(legacy Zuul v2 jobs only). + gate-tests - Configures and runs the int-tests in a devstack vm-gate environment. --tools-- debug - Debug this script (shows all commands). @@ -1520,7 +1529,9 @@ function run_command() { "clean" ) shift; cmd_clean $@;; "run" ) shift; cmd_run $@;; "kick-start" ) shift; cmd_kick_start $@;; - "dsvm-gate-tests" ) shift; cmd_dsvm_gate_tests $@;; + "dsvm-gate-tests" ) shift; export GATE_JOB_VER=v2; \ + cmd_gate_tests $@;; + "gate-tests" ) shift; cmd_gate_tests $@;; "run-fake" ) shift; cmd_run_fake $@;; "start-fake" ) shift; cmd_start_fake $@;; "update-projects" ) cmd_clone_projects force_update \ diff --git a/playbooks/legacy/trove-functional-dsvm-mysql/post.yaml b/playbooks/legacy/trove-functional-dsvm-mysql/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-functional-dsvm-mysql/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/trove-functional-dsvm-mysql/run.yaml b/playbooks/legacy/trove-functional-dsvm-mysql/run.yaml deleted file mode 100644 index 17dbbcd7..00000000 --- a/playbooks/legacy/trove-functional-dsvm-mysql/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-legacy-functional-dsvm-mysql from old job gate-trove-legacy-functional-dsvm-mysql - 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 trove git://git.openstack.org/openstack/trove - TROVE_RESIZE_TIME_OUT=1800 - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - export TROVE_RESIZE_TIME_OUT=1800 - ./trovestack dsvm-gate-tests mysql - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-cassandra-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/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/trove-scenario-dsvm-cassandra-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml deleted file mode 100644 index 5de48736..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-cassandra-multi from old job - gate-trove-scenario-dsvm-cassandra-multi-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests cassandra cassandra-supported-multi - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-cassandra-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-cassandra-single/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/trove-scenario-dsvm-cassandra-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml deleted file mode 100644 index 543eea98..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-cassandra-single from old job - gate-trove-scenario-dsvm-cassandra-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests cassandra cassandra-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-couchbase-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-couchbase-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-couchbase-single/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/trove-scenario-dsvm-couchbase-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml deleted file mode 100644 index 11e23019..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-couchbase-single from old job - gate-trove-scenario-dsvm-couchbase-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests couchbase couchbase-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-couchdb-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-couchdb-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-couchdb-single/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/trove-scenario-dsvm-couchdb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml deleted file mode 100644 index b54be3b7..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-couchdb-single from old job gate-trove-scenario-dsvm-couchdb-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests couchdb couchdb-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-mariadb-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/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/trove-scenario-dsvm-mariadb-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml deleted file mode 100644 index d29f55d4..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-mariadb-multi from old job gate-trove-scenario-dsvm-mariadb-multi-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests mariadb mariadb-supported-multi - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-mariadb-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mariadb-single/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/trove-scenario-dsvm-mariadb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml deleted file mode 100644 index dc9202ae..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-mariadb-single from old job gate-trove-scenario-dsvm-mariadb-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests mariadb mariadb-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-mongodb-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/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/trove-scenario-dsvm-mongodb-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml deleted file mode 100644 index f5e99187..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-mongodb-multi from old job gate-trove-scenario-dsvm-mongodb-multi-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests mongodb mongodb-supported-multi - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-mongodb-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mongodb-single/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/trove-scenario-dsvm-mongodb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml deleted file mode 100644 index b3cbc855..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-mongodb-single from old job gate-trove-scenario-dsvm-mongodb-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests mongodb mongodb-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-mysql-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-multi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mysql-multi/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/trove-scenario-dsvm-mysql-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml deleted file mode 100644 index e8812ecf..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-mysql-multi from old job gate-trove-scenario-dsvm-mysql-multi-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests mysql mysql-supported-multi - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-mysql-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mysql-single/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/trove-scenario-dsvm-mysql-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml deleted file mode 100644 index 0ce0bcbb..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-mysql-single from old job gate-trove-scenario-dsvm-mysql-single-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests mysql mysql-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-percona-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-multi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-percona-multi/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/trove-scenario-dsvm-percona-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml deleted file mode 100644 index 88166225..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-percona-multi from old job gate-trove-scenario-dsvm-percona-multi-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests percona percona-supported-multi - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-percona-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-percona-single/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/trove-scenario-dsvm-percona-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml deleted file mode 100644 index 97909b92..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-percona-single from old job gate-trove-scenario-dsvm-percona-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests percona percona-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-postgresql-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/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/trove-scenario-dsvm-postgresql-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml deleted file mode 100644 index 89de7a0d..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-postgresql-multi from old job - gate-trove-scenario-dsvm-postgresql-multi-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests postgresql postgresql-supported-multi - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-postgresql-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-postgresql-single/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/trove-scenario-dsvm-postgresql-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml deleted file mode 100644 index 4ed4bb7e..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-postgresql-single from old job - gate-trove-scenario-dsvm-postgresql-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests postgresql postgresql-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-pxc-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-multi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-pxc-multi/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/trove-scenario-dsvm-pxc-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml deleted file mode 100644 index 6845861d..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-pxc-multi from old job gate-trove-scenario-dsvm-pxc-multi-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests pxc pxc-supported-multi - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-pxc-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-pxc-single/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/trove-scenario-dsvm-pxc-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml deleted file mode 100644 index ad4e229d..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-pxc-single from old job gate-trove-scenario-dsvm-pxc-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests pxc pxc-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-redis-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-multi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-redis-multi/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/trove-scenario-dsvm-redis-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml deleted file mode 100644 index 1a125bc7..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-redis-multi from old job gate-trove-scenario-dsvm-redis-multi-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests redis redis-supported-multi - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-scenario-dsvm-redis-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-single/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-redis-single/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/trove-scenario-dsvm-redis-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml deleted file mode 100644 index ae4d955e..00000000 --- a/playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-scenario-dsvm-redis-single from old job gate-trove-scenario-dsvm-redis-single-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 trove git://git.openstack.org/openstack/trove - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=tempest - ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account - ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond - export ENABLED_SERVICES - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TROVE=1 - export PROJECTS="openstack/trove-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-troveclient - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - - function post_test_hook { - export BRIDGE_IP=10.1.0.1 - export DEST=$BASE/new - export PATH_DEVSTACK_SRC=$DEST/devstack - cd /opt/stack/new/trove/integration/scripts - ./trovestack dsvm-gate-tests redis redis-supported-single - } - export -f post_test_hook - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - 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/trove-devstack-base.yaml b/playbooks/trove-devstack-base.yaml new file mode 100644 index 00000000..0e0c9de0 --- /dev/null +++ b/playbooks/trove-devstack-base.yaml @@ -0,0 +1,4 @@ +- hosts: all + roles: + - run-devstack + - trove-devstack diff --git a/roles/trove-devstack/README b/roles/trove-devstack/README new file mode 100644 index 00000000..d133b426 --- /dev/null +++ b/roles/trove-devstack/README @@ -0,0 +1,8 @@ +Trove devstack + +** Role Variables ** + +.. zuul:rolevar:: trove_test_group + :default: mysql + + The test group for running trovestack. diff --git a/roles/trove-devstack/defaults/main.yml b/roles/trove-devstack/defaults/main.yml new file mode 100644 index 00000000..e525b714 --- /dev/null +++ b/roles/trove-devstack/defaults/main.yml @@ -0,0 +1,4 @@ +devstack_base_dir: /opt/stack +trove_test_datastore: 'mysql' +trove_test_group: '' +trove_resize_time_out: '' diff --git a/roles/trove-devstack/tasks/main.yml b/roles/trove-devstack/tasks/main.yml new file mode 100644 index 00000000..7ee91646 --- /dev/null +++ b/roles/trove-devstack/tasks/main.yml @@ -0,0 +1,9 @@ +- name: Run trovestack + shell: | + export BRIDGE_IP=10.1.0.1 + export DEST={{devstack_base_dir}} + export PATH_DEVSTACK_SRC=$DEST/devstack + export TROVE_RESIZE_TIME_OUT={{trove_resize_time_out}} + + cd $DEST/trove/integration/scripts + ./trovestack gate-tests {{trove_test_datastore}} {{trove_test_group}} @@ -66,7 +66,9 @@ show-source = True ignore = F821,H301,H404,H405,H501,E402,W503,E731 enable-extensions = H203,H106 builtins = _ -exclude=.venv,.tox,.git,dist,doc,*egg,tools,etc,build,*.po,*.pot,integration,releasenotes +# add *.yaml for playbooks/trove-devstack-base.yaml, as it will be matched by +# trove-* in the "filename" configuration. +exclude=.venv,.tox,.git,dist,doc,*egg,tools,etc,build,*.po,*.pot,integration,releasenotes,*.yaml filename=*.py,trove-*,app.wsgi [hacking] |