diff --git a/playbooks/legacy/tempest-dsvm-lxd-linuxbridge/post.yaml b/playbooks/legacy/tempest-dsvm-lxd-linuxbridge/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/tempest-dsvm-lxd-linuxbridge/post.yaml +++ /dev/null @@ -1,80 +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 - - - 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-lxd-linuxbridge/run.yaml b/playbooks/legacy/tempest-dsvm-lxd-linuxbridge/run.yaml deleted file mode 100644 index a207bdae..00000000 --- a/playbooks/legacy/tempest-dsvm-lxd-linuxbridge/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-lxd-linuxbridge from old job gate-tempest-dsvm-lxd-linuxbridge-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 nova-lxd https://opendev.org/x/nova-lxd - # Enable linuxbridge agent and configure physical network - Q_AGENT=linuxbridge - PHYSICAL_NETWORK=default - - 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_VIRT_DRIVER="lxd" - export PROJECTS="x/nova-lxd $PROJECTS" - - # keep localrc to be able to set some vars in pre_test hook - export KEEP_LOCALRC=1 - - function pre_test_hook { - source $BASE/new/nova-lxd/contrib/ci/pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - source $BASE/new/nova-lxd/contrib/ci/post_test_hook.sh - } - export -f post_test_hook - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova-lxd/devstack/tempest-dsvm-lxd-rc - - 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-lxd-ovs/post.yaml b/playbooks/legacy/tempest-dsvm-lxd-ovs/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/tempest-dsvm-lxd-ovs/post.yaml +++ /dev/null @@ -1,80 +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 - - - 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-lxd-ovs/run.yaml b/playbooks/legacy/tempest-dsvm-lxd-ovs/run.yaml deleted file mode 100644 index 2d0e7f21..00000000 --- a/playbooks/legacy/tempest-dsvm-lxd-ovs/run.yaml +++ /dev/null @@ -1,71 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-lxd-ovs from old job gate-tempest-dsvm-lxd-ovs - 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 nova-lxd https://opendev.org/x/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_FULL=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER="lxd" - export PROJECTS="x/nova-lxd $PROJECTS" - - - # keep localrc to be able to set some vars in pre_test hook - export KEEP_LOCALRC=1 - - function pre_test_hook { - source $BASE/new/nova-lxd/contrib/ci/pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - source $BASE/new/nova-lxd/contrib/ci/post_test_hook.sh - } - export -f post_test_hook - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova-lxd/devstack/tempest-dsvm-lxd-rc - - 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 f35ccf40..a2848480 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -66,26 +66,6 @@ run: playbooks/legacy/sandbox-tag/run.yaml timeout: 1800 -- job: - name: legacy-tempest-dsvm-lxd-linuxbridge - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-lxd-linuxbridge/run.yaml - post-run: playbooks/legacy/tempest-dsvm-lxd-linuxbridge/post.yaml - timeout: 7800 - required-projects: - - x/nova-lxd - - openstack/tempest - -- job: - name: legacy-tempest-dsvm-lxd-ovs - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-lxd-ovs/run.yaml - post-run: playbooks/legacy/tempest-dsvm-lxd-ovs/post.yaml - timeout: 7800 - required-projects: - - x/nova-lxd - - openstack/tempest - - job: name: legacy-tempest-dsvm-monasca-transform-python35-functional parent: legacy-dsvm-base