diff --git a/playbooks/legacy/trove-functional-dsvm-mysql-newton/post.yaml b/playbooks/legacy/trove-functional-dsvm-mysql-newton/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-functional-dsvm-mysql-newton/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-newton/run.yaml b/playbooks/legacy/trove-functional-dsvm-mysql-newton/run.yaml deleted file mode 100644 index 617d2464..00000000 --- a/playbooks/legacy/trove-functional-dsvm-mysql-newton/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-legacy-functional-dsvm-mysql-newton from old - job gate-trove-legacy-functional-dsvm-mysql-newton - 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" - export PROJECTS="openstack/trove-integration $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 - ./redstack dsvm-gate-tests mysql - } - export -f post_test_hook - - export BRANCH_OVERRIDE=stable/newton - 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-functional-dsvm-redis-newton/post.yaml b/playbooks/legacy/trove-functional-dsvm-redis-newton/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/trove-functional-dsvm-redis-newton/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-redis-newton/run.yaml b/playbooks/legacy/trove-functional-dsvm-redis-newton/run.yaml deleted file mode 100644 index 1266f4c7..00000000 --- a/playbooks/legacy/trove-functional-dsvm-redis-newton/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-trove-legacy-functional-dsvm-redis-newton from old - job gate-trove-legacy-functional-dsvm-redis-newton - 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" - export PROJECTS="openstack/trove-integration $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 - ./redstack dsvm-gate-tests redis - } - export -f post_test_hook - - export BRANCH_OVERRIDE=stable/newton - 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/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 50616b21..e4738219 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -10785,111 +10785,6 @@ - openstack/trove - openstack/trove-dashboard -- job: - name: legacy-trove-legacy-functional-dsvm-mysql - parent: legacy-dsvm-base - run: playbooks/legacy/trove-functional-dsvm-mysql/run - post-run: playbooks/legacy/trove-functional-dsvm-mysql/post - timeout: 9000 - required-projects: - - openstack-infra/devstack-gate - - openstack/diskimage-builder - - openstack/python-troveclient - - openstack/tripleo-image-elements - - openstack/trove - - openstack/trove-dashboard - - openstack/trove-integration - -- job: - name: legacy-trove-legacy-functional-dsvm-mysql-newton - parent: legacy-dsvm-base - run: playbooks/legacy/trove-functional-dsvm-mysql-newton/run - post-run: playbooks/legacy/trove-functional-dsvm-mysql-newton/post - timeout: 9000 - required-projects: - - openstack-infra/devstack-gate - - openstack/diskimage-builder - - openstack/python-troveclient - - openstack/tripleo-image-elements - - openstack/trove - - openstack/trove-dashboard - - openstack/trove-integration - -- job: - name: legacy-trove-legacy-functional-dsvm-redis-newton - parent: legacy-dsvm-base - run: playbooks/legacy/trove-functional-dsvm-redis-newton/run - post-run: playbooks/legacy/trove-functional-dsvm-redis-newton/post - timeout: 9000 - required-projects: - - openstack-infra/devstack-gate - - openstack/diskimage-builder - - openstack/python-troveclient - - openstack/tripleo-image-elements - - openstack/trove - - openstack/trove-dashboard - - openstack/trove-integration - -- job: - name: legacy-trove-legacy-scenario-dsvm-mysql - parent: legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-mysql/run - post-run: playbooks/legacy/trove-scenario-dsvm-mysql/post - timeout: 9000 - required-projects: - - openstack-infra/devstack-gate - - openstack/diskimage-builder - - openstack/python-troveclient - - openstack/tripleo-image-elements - - openstack/trove - - openstack/trove-dashboard - - openstack/trove-integration - -- job: - name: legacy-trove-legacy-scenario-dsvm-postgresql - parent: legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-postgresql/run - post-run: playbooks/legacy/trove-scenario-dsvm-postgresql/post - timeout: 9000 - required-projects: - - openstack-infra/devstack-gate - - openstack/diskimage-builder - - openstack/python-troveclient - - openstack/tripleo-image-elements - - openstack/trove - - openstack/trove-dashboard - - openstack/trove-integration - -- job: - name: legacy-trove-legacy-scenario-dsvm-pxc - parent: legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-pxc/run - post-run: playbooks/legacy/trove-scenario-dsvm-pxc/post - timeout: 9000 - required-projects: - - openstack-infra/devstack-gate - - openstack/diskimage-builder - - openstack/python-troveclient - - openstack/tripleo-image-elements - - openstack/trove - - openstack/trove-dashboard - - openstack/trove-integration - -- job: - name: legacy-trove-legacy-scenario-dsvm-redis - parent: legacy-dsvm-base - run: playbooks/legacy/trove-scenario-dsvm-redis/run - post-run: playbooks/legacy/trove-scenario-dsvm-redis/post - timeout: 9000 - required-projects: - - openstack-infra/devstack-gate - - openstack/diskimage-builder - - openstack/python-troveclient - - openstack/tripleo-image-elements - - openstack/trove - - openstack/trove-dashboard - - openstack/trove-integration - - job: name: legacy-trove-scenario-dsvm-cassandra-multi parent: legacy-dsvm-base