diff --git a/playbooks/legacy/octavia-tox-functional-py35/post.yaml b/playbooks/legacy/octavia-tox-functional-py35/post.yaml deleted file mode 100644 index 68fbdf81..00000000 --- a/playbooks/legacy/octavia-tox-functional-py35/post.yaml +++ /dev/null @@ -1,67 +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 diff --git a/playbooks/legacy/octavia-tox-functional-py35/run.yaml b/playbooks/legacy/octavia-tox-functional-py35/run.yaml deleted file mode 100644 index 5cb32ec8..00000000 --- a/playbooks/legacy/octavia-tox-functional-py35/run.yaml +++ /dev/null @@ -1,86 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-octavia-tox-functional-py35 from old job gate-octavia-tox-functional-py35-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - REQS_DIR=`mktemp -d` - function cleanup { - mkdir -p $WORKSPACE - rm -rf $CLONEMAP $REQS_DIR - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - # zuul cloner works poorly if there are 2 names that are the - # same in here. - if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then - cat >> $CLONEMAP << EOF - - name: openstack/requirements - dest: $REQS_DIR - EOF - fi - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT openstack/requirements - # REQS_DIR is not set for openstack/requirements and there is also - # no need to copy in this case. - if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then - cp $REQS_DIR/upper-constraints.txt ./ - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - if [ -x tools/test-setup.sh ] ; then - tools/test-setup.sh - fi - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -x - sudo rm -f /etc/sudoers.d/zuul - # Prove that general sudo access is actually revoked - ! sudo -n true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/run-tox.sh functional-py35 - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - OUT=`git ls-files --other --exclude-standard --directory` - if [ -z "$OUT" ]; then - echo "No extra files created during test." - exit 0 - else - echo "The following un-ignored files were created during the test:" - echo "$OUT" - exit 0 # TODO: change to 1 to fail tests. - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/octavia-tox-functional/post.yaml b/playbooks/legacy/octavia-tox-functional/post.yaml deleted file mode 100644 index 68fbdf81..00000000 --- a/playbooks/legacy/octavia-tox-functional/post.yaml +++ /dev/null @@ -1,67 +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 diff --git a/playbooks/legacy/octavia-tox-functional/run.yaml b/playbooks/legacy/octavia-tox-functional/run.yaml deleted file mode 100644 index 39ef3ba4..00000000 --- a/playbooks/legacy/octavia-tox-functional/run.yaml +++ /dev/null @@ -1,86 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-octavia-tox-functional from old job gate-octavia-tox-functional-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - REQS_DIR=`mktemp -d` - function cleanup { - mkdir -p $WORKSPACE - rm -rf $CLONEMAP $REQS_DIR - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - # zuul cloner works poorly if there are 2 names that are the - # same in here. - if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then - cat >> $CLONEMAP << EOF - - name: openstack/requirements - dest: $REQS_DIR - EOF - fi - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT openstack/requirements - # REQS_DIR is not set for openstack/requirements and there is also - # no need to copy in this case. - if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then - cp $REQS_DIR/upper-constraints.txt ./ - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - if [ -x tools/test-setup.sh ] ; then - tools/test-setup.sh - fi - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -x - sudo rm -f /etc/sudoers.d/zuul - # Prove that general sudo access is actually revoked - ! sudo -n true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/run-tox.sh functional - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - OUT=`git ls-files --other --exclude-standard --directory` - if [ -z "$OUT" ]; then - echo "No extra files created during test." - exit 0 - else - echo "The following un-ignored files were created during the test:" - echo "$OUT" - exit 0 # TODO: change to 1 to fail tests. - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/post.yaml b/playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/run.yaml b/playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/run.yaml deleted file mode 100644 index 28b9440f..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/run.yaml +++ /dev/null @@ -1,69 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-octavia-v1-dsvm-py3x-scenario-multinode from old - job gate-octavia-v1-dsvm-py3x-scenario-multinode - 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 DEVSTACK_GATE_USE_PYTHON3=True - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_GATE_TOPOLOGY="multinode" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - if ! [[ "$ZUUL_BRANCH" =~ "stable/newton"|"stable/ocata" ]]; then - export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient" - export OVERRIDE_PYTHON_OCTAVIACLIENT_PROJECT_BRANCH=$ZUUL_BRANCH - fi - - function gate_hook { - $BASE/new/octavia/octavia/tests/contrib/gate_hook.sh tempest v1 scenario - } - export -f gate_hook - - function post_test_hook { - $BASE/new/octavia/octavia/tests/contrib/post_test_hook.sh tempest v1 scenario - } - 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/octavia-v1-dsvm-py3x-scenario/post.yaml b/playbooks/legacy/octavia-v1-dsvm-py3x-scenario/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-py3x-scenario/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/octavia-v1-dsvm-py3x-scenario/run.yaml b/playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml deleted file mode 100644 index 170f3e83..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml +++ /dev/null @@ -1,67 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-octavia-v1-dsvm-py3x-scenario from old job gate-octavia-v1-dsvm-py3x-scenario-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export DEVSTACK_GATE_USE_PYTHON3=True - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - if ! [[ "$ZUUL_BRANCH" =~ "stable/newton"|"stable/ocata" ]]; then - export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient" - export OVERRIDE_PYTHON_OCTAVIACLIENT_PROJECT_BRANCH=$ZUUL_BRANCH - fi - - function gate_hook { - $BASE/new/octavia/octavia/tests/contrib/gate_hook.sh tempest v1 scenario - } - export -f gate_hook - - function post_test_hook { - $BASE/new/octavia/octavia/tests/contrib/post_test_hook.sh tempest v1 scenario - } - 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/octavia-v1-dsvm-scenario-kvm-centos.7/post.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/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/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml deleted file mode 100644 index 6a6948ab..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-octavia-v1-dsvm-scenario-kvm-centos.7 from old job - gate-octavia-v1-dsvm-scenario-kvm-centos.7-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]] - OCTAVIA_HYPERVISOR=kvm - OCTAVIA_AMP_BASE_OS=centos - OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID=7 - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - if ! [[ "$ZUUL_BRANCH" =~ "stable/newton"|"stable/ocata" ]]; then - export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient" - export OVERRIDE_PYTHON_OCTAVIACLIENT_PROJECT_BRANCH=$ZUUL_BRANCH - fi - - function gate_hook { - $BASE/new/octavia/octavia/tests/contrib/gate_hook.sh tempest v1 scenario - } - export -f gate_hook - - function post_test_hook { - $BASE/new/octavia/octavia/tests/contrib/post_test_hook.sh tempest v1 scenario - } - 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/octavia-v1-dsvm-scenario-lxd/post.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario-lxd/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-scenario-lxd/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/octavia-v1-dsvm-scenario-lxd/run.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario-lxd/run.yaml deleted file mode 100644 index 7c48b0d0..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-scenario-lxd/run.yaml +++ /dev/null @@ -1,81 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-octavia-v1-dsvm-scenario-lxd from old job gate-octavia-v1-dsvm-scenario-lxd-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 nova-lxd https://git.openstack.org/openstack/nova-lxd - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/nova-lxd $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - if ! [[ "$ZUUL_BRANCH" =~ "stable/newton"|"stable/ocata" ]]; then - export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient" - export OVERRIDE_PYTHON_OCTAVIACLIENT_PROJECT_BRANCH=$ZUUL_BRANCH - fi - - function gate_hook { - $BASE/new/octavia/octavia/tests/contrib/gate_hook.sh tempest v1 scenario - } - export -f gate_hook - - function post_test_hook { - $BASE/new/octavia/octavia/tests/contrib/post_test_hook.sh tempest v1 scenario - } - 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/octavia-v1-dsvm-scenario-multinode/post.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario-multinode/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-scenario-multinode/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/octavia-v1-dsvm-scenario-multinode/run.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario-multinode/run.yaml deleted file mode 100644 index e6e9a283..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-scenario-multinode/run.yaml +++ /dev/null @@ -1,67 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-octavia-v1-dsvm-scenario-multinode from old job gate-octavia-v1-dsvm-scenario-multinode - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_GATE_TOPOLOGY="multinode" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - if ! [[ "$ZUUL_BRANCH" =~ "stable/newton"|"stable/ocata" ]]; then - export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient" - export OVERRIDE_PYTHON_OCTAVIACLIENT_PROJECT_BRANCH=$ZUUL_BRANCH - fi - - function gate_hook { - $BASE/new/octavia/octavia/tests/contrib/gate_hook.sh tempest v1 scenario - } - export -f gate_hook - - function post_test_hook { - $BASE/new/octavia/octavia/tests/contrib/post_test_hook.sh tempest v1 scenario - } - 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/octavia-v1-dsvm-scenario/post.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-scenario/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/octavia-v1-dsvm-scenario/run.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml deleted file mode 100644 index 9501fd5d..00000000 --- a/playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml +++ /dev/null @@ -1,66 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-octavia-v1-dsvm-scenario from old job gate-octavia-v1-dsvm-scenario-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/tripleo-image-elements $PROJECTS" - export PROJECTS="openstack/neutron-lbaas $PROJECTS" - export PROJECTS="openstack/octavia $PROJECTS" - - if ! [[ "$ZUUL_BRANCH" =~ "stable/newton"|"stable/ocata" ]]; then - export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient" - export OVERRIDE_PYTHON_OCTAVIACLIENT_PROJECT_BRANCH=$ZUUL_BRANCH - fi - - function gate_hook { - $BASE/new/octavia/octavia/tests/contrib/gate_hook.sh tempest v1 scenario - } - export -f gate_hook - - function post_test_hook { - $BASE/new/octavia/octavia/tests/contrib/post_test_hook.sh tempest v1 scenario - } - 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 4305df9c..8c1a2075 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -5247,125 +5247,6 @@ required-projects: - openstack/horizon -- job: - name: legacy-octavia-tox-functional - parent: legacy-base - run: playbooks/legacy/octavia-tox-functional/run - post-run: playbooks/legacy/octavia-tox-functional/post - timeout: 2400 - required-projects: - - openstack/requirements - -- job: - name: legacy-octavia-tox-functional-py35 - parent: legacy-base - run: playbooks/legacy/octavia-tox-functional-py35/run - post-run: playbooks/legacy/octavia-tox-functional-py35/post - timeout: 2400 - required-projects: - - openstack/requirements - -- job: - name: legacy-octavia-v1-dsvm-py3x-scenario - parent: legacy-dsvm-base - run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run - post-run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/python-octaviaclient - - openstack/tripleo-image-elements - -- job: - name: legacy-octavia-v1-dsvm-py3x-scenario-multinode - parent: legacy-dsvm-base-multinode - run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/run - post-run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/python-octaviaclient - - openstack/tripleo-image-elements - nodeset: legacy-ubuntu-xenial-2-node - -- job: - name: legacy-octavia-v1-dsvm-scenario - parent: legacy-dsvm-base - run: playbooks/legacy/octavia-v1-dsvm-scenario/run - post-run: playbooks/legacy/octavia-v1-dsvm-scenario/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/python-octaviaclient - - openstack/tripleo-image-elements - -- job: - name: legacy-octavia-v1-dsvm-scenario-kvm-centos.7 - parent: legacy-dsvm-base - run: playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run - post-run: playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/barbican-tempest-plugin - - openstack/diskimage-builder - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/python-octaviaclient - - openstack/tripleo-image-elements - -- job: - name: legacy-octavia-v1-dsvm-scenario-lxd - parent: legacy-dsvm-base - run: playbooks/legacy/octavia-v1-dsvm-scenario-lxd/run - post-run: playbooks/legacy/octavia-v1-dsvm-scenario-lxd/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/barbican-tempest-plugin - - openstack/diskimage-builder - - openstack/neutron-lbaas - - openstack/nova-lxd - - openstack/octavia - - openstack/python-barbicanclient - - openstack/python-octaviaclient - - openstack/tripleo-image-elements - -- job: - name: legacy-octavia-v1-dsvm-scenario-multinode - parent: legacy-dsvm-base-multinode - run: playbooks/legacy/octavia-v1-dsvm-scenario-multinode/run - post-run: playbooks/legacy/octavia-v1-dsvm-scenario-multinode/post - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/barbican - - openstack/diskimage-builder - - openstack/neutron-lbaas - - openstack/octavia - - openstack/python-barbicanclient - - openstack/python-octaviaclient - - openstack/tripleo-image-elements - nodeset: legacy-ubuntu-xenial-2-node - - job: name: legacy-omni-tests parent: legacy-base