diff --git a/playbooks/legacy/tempest-dsvm-full-sheepdog-src-os-brick/post.yaml b/playbooks/legacy/tempest-dsvm-full-sheepdog-src-os-brick/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-full-sheepdog-src-os-brick/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-full-sheepdog-src-os-brick/run.yaml b/playbooks/legacy/tempest-dsvm-full-sheepdog-src-os-brick/run.yaml deleted file mode 100644 index 6a9944f3..00000000 --- a/playbooks/legacy/tempest-dsvm-full-sheepdog-src-os-brick/run.yaml +++ /dev/null @@ -1,63 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-full-sheepdog-src-os-brick from old - job gate-tempest-dsvm-full-sheepdog-src-os-brick-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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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 devstack-plugin-sheepdog https://opendev.org/x/devstack-plugin-sheepdog - - 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 PROJECTS="x/devstack-plugin-sheepdog $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=os-brick - - if [[ "sheepdog" = "sheepdog" ]]; then - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - # As we are setting DEVSTACK_GATE_TEMPEST_ALL_PLUGINS, we need - # to add the regex to limit the tests to the same as a tempest - # -efull would run. - export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' - else - export DEVSTACK_GATE_TEMPEST_FULL=1 - 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-full-sheepdog/post.yaml b/playbooks/legacy/tempest-dsvm-full-sheepdog/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-full-sheepdog/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-full-sheepdog/run.yaml b/playbooks/legacy/tempest-dsvm-full-sheepdog/run.yaml deleted file mode 100644 index e3e06108..00000000 --- a/playbooks/legacy/tempest-dsvm-full-sheepdog/run.yaml +++ /dev/null @@ -1,61 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-full-sheepdog from old job gate-tempest-dsvm-full-sheepdog-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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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 devstack-plugin-sheepdog https://opendev.org/x/devstack-plugin-sheepdog - - 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 PROJECTS="x/devstack-plugin-sheepdog $PROJECTS" - - if [[ "sheepdog" = "sheepdog" ]]; then - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - # As we are setting DEVSTACK_GATE_TEMPEST_ALL_PLUGINS, we need - # to add the regex to limit the tests to the same as a tempest - # -efull would run. - export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' - else - export DEVSTACK_GATE_TEMPEST_FULL=1 - 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 45392b7e..480b426f 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -1057,29 +1057,6 @@ - openstack/os-brick - openstack/tempest -- job: - name: legacy-tempest-dsvm-full-sheepdog - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-full-sheepdog/run.yaml - post-run: playbooks/legacy/tempest-dsvm-full-sheepdog/post.yaml - timeout: 10800 - required-projects: - - openstack/devstack-gate - - x/devstack-plugin-sheepdog - - openstack/tempest - -- job: - name: legacy-tempest-dsvm-full-sheepdog-src-os-brick - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-full-sheepdog-src-os-brick/run.yaml - post-run: playbooks/legacy/tempest-dsvm-full-sheepdog-src-os-brick/post.yaml - timeout: 10800 - required-projects: - - openstack/devstack-gate - - x/devstack-plugin-sheepdog - - openstack/os-brick - - openstack/tempest - - job: name: legacy-tempest-dsvm-ironic-pxe_snmp-virtualpdu-src parent: legacy-dsvm-base