diff --git a/.zuul.yaml b/.zuul.yaml index 4c807e2..5046ceb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,8 +1,6 @@ - job: - name: ironic-staging-drivers-dsvm-all-drivers - parent: legacy-dsvm-base - run: playbooks/legacy/ironic-staging-drivers-dsvm-all-drivers/run.yaml - post-run: playbooks/legacy/ironic-staging-drivers-dsvm-all-drivers/post.yaml + name: ironic-staging-drivers-all + parent: ironic-base timeout: 4800 irrelevant-files: - ^test-requirements.txt$ @@ -11,10 +9,14 @@ - ^releasenotes/.*$ - ^ironic-staging-drivers/tests/.*$ required-projects: - - openstack/devstack-gate - openstack/ironic - openstack/ironic-python-agent-builder - x/ironic-staging-drivers + vars: + devstack_localrc: + IRONIC_DEFAULT_DEPLOY_INTERFACE: "" + devstack_plugins: + ironic-staging-drivers: https://opendev.org/x/ironic-staging-drivers - project: vars: @@ -26,7 +28,7 @@ - check-requirements check: jobs: - - ironic-staging-drivers-dsvm-all-drivers + - ironic-staging-drivers-all gate: jobs: - - ironic-staging-drivers-dsvm-all-drivers + - ironic-staging-drivers-all diff --git a/playbooks/legacy/ironic-staging-drivers-dsvm-all-drivers/post.yaml b/playbooks/legacy/ironic-staging-drivers-dsvm-all-drivers/post.yaml deleted file mode 100644 index e07f551..0000000 --- a/playbooks/legacy/ironic-staging-drivers-dsvm-all-drivers/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/ironic-staging-drivers-dsvm-all-drivers/run.yaml b/playbooks/legacy/ironic-staging-drivers-dsvm-all-drivers/run.yaml deleted file mode 100644 index e05d5bc..0000000 --- a/playbooks/legacy/ironic-staging-drivers-dsvm-all-drivers/run.yaml +++ /dev/null @@ -1,65 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ironic-staging-drivers-dsvm from old job gate-ironic-staging-drivers-dsvm-ubuntu-xenial - 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 ironic https://opendev.org/openstack/ironic - enable_plugin ironic-staging-drivers https://opendev.org/x/ironic-staging-drivers - IRONIC_BUILD_DEPLOY_RAMDISK=False - IRONIC_RAMDISK_TYPE=tinyipa - - 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_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - export DEVSTACK_GATE_USE_PYTHON3=True - export BRANCH_OVERRIDE=default - export PROJECTS="openstack/ironic $PROJECTS" - export PROJECTS="x/ironic-staging-drivers $PROJECTS" - export PROJECTS="openstack/ironic-python-agent-builder $PROJECTS" - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - # No post_test_hook is needed while tests live in tempest - 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 }}'