diff --git a/playbooks/legacy/periodic-tempest-dsvm-neutron-full-newton/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-neutron-full-newton/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-neutron-full-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/periodic-tempest-dsvm-neutron-full-newton/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-neutron-full-newton/run.yaml deleted file mode 100644 index 147e036e..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-neutron-full-newton/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-neutron-full-newton from old - job periodic-tempest-dsvm-neutron-full-ubuntu-xenial-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_FILE_INJECTION=True - - 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_FULL=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TLSPROXY=1 - 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/periodic-tempest-dsvm-nnet-newton/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-nnet-newton/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-nnet-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/periodic-tempest-dsvm-nnet-newton/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-nnet-newton/run.yaml deleted file mode 100644 index 60cd5be3..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-nnet-newton/run.yaml +++ /dev/null @@ -1,43 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-nnet-newton from old job periodic-tempest-dsvm-nnet-ubuntu-xenial-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_TLSPROXY=1 - export DEVSTACK_GATE_NEUTRON=0 - 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/tempest-dsvm-neutron-full-newton/post.yaml b/playbooks/legacy/tempest-dsvm-neutron-full-newton/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-neutron-full-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/tempest-dsvm-neutron-full-newton/run.yaml b/playbooks/legacy/tempest-dsvm-neutron-full-newton/run.yaml deleted file mode 100644 index 2529a92e..00000000 --- a/playbooks/legacy/tempest-dsvm-neutron-full-newton/run.yaml +++ /dev/null @@ -1,56 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-neutron-full-newton from old job gate-tempest-dsvm-neutron-full-ubuntu-xenial-newton-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_FILE_INJECTION=True - - 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_FULL=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TLSPROXY=1 - 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/tempest-dsvm-nnet-newton/post.yaml b/playbooks/legacy/tempest-dsvm-nnet-newton/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-nnet-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/tempest-dsvm-nnet-newton/run.yaml b/playbooks/legacy/tempest-dsvm-nnet-newton/run.yaml deleted file mode 100644 index 425bdb55..00000000 --- a/playbooks/legacy/tempest-dsvm-nnet-newton/run.yaml +++ /dev/null @@ -1,43 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-nnet-newton from old job gate-tempest-dsvm-nnet-ubuntu-xenial-newton-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_FULL=1 - export DEVSTACK_GATE_TLSPROXY=1 - export DEVSTACK_GATE_NEUTRON=0 - 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 69783cbc..fabcbc57 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -1963,18 +1963,6 @@ - openstack/tap-as-a-service - openstack/tempest -- job: - name: legacy-periodic-tempest-dsvm-neutron-full-newton - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-newton/run.yaml - post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-full-newton/post.yaml - timeout: 10800 - branches: stable/newton - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/tempest - - job: name: legacy-periodic-tempest-dsvm-neutron-full-non-admin-master parent: legacy-dsvm-base @@ -2011,17 +1999,6 @@ - openstack/neutron - openstack/tempest -- job: - name: legacy-periodic-tempest-dsvm-nnet-newton - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-nnet-newton/run.yaml - post-run: playbooks/legacy/periodic-tempest-dsvm-nnet-newton/post.yaml - branches: stable/newton - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/tempest - - job: name: legacy-periodic-tempest-dsvm-oslo-latest-full-master parent: legacy-dsvm-base @@ -4015,17 +3992,6 @@ - openstack/neutron - openstack/tempest -- job: - name: legacy-tempest-dsvm-neutron-full-newton - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-neutron-full-newton/run.yaml - post-run: playbooks/legacy/tempest-dsvm-neutron-full-newton/post.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/tempest - - job: name: legacy-tempest-dsvm-neutron-full-non-admin parent: legacy-dsvm-base @@ -4208,16 +4174,6 @@ - openstack-infra/devstack-gate - openstack/tempest -- job: - name: legacy-tempest-dsvm-nnet-newton - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-nnet-newton/run.yaml - post-run: playbooks/legacy/tempest-dsvm-nnet-newton/post.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/tempest - - job: name: legacy-tempest-dsvm-nova-libvirt-kvm-apr parent: legacy-dsvm-base