From 9a013119443ccea872ababc86a6877260994823e Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Fri, 3 Aug 2018 10:33:22 +0100 Subject: [PATCH] Switch ironic-tempest-dsvm-ironic-inspector too zuulv3 Change-Id: I666407340eae5396069697ef026b66c43dc54ec9 --- .../tempest-dsvm-ironic-inspector/run.yaml | 85 ------------------- zuul.d/ironic-jobs.yaml | 21 +++++ zuul.d/legacy-ironic-jobs.yaml | 17 ---- 3 files changed, 21 insertions(+), 102 deletions(-) delete mode 100644 playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml diff --git a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml deleted file mode 100644 index 1dc57deb0a..0000000000 --- a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml +++ /dev/null @@ -1,85 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-ironic-inspector from old job gate-tempest-dsvm-ironic-inspector-ubuntu-xenial-nv - tasks: - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - - export DEVSTACK_GATE_TEMPEST_REGEX="InspectorBasicTest" - - export PROJECTS="openstack/ironic-inspector $PROJECTS" - export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS" - export DEVSTACK_GATE_IRONIC_INSPECTOR=1 - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector" - - # Make IPXE configuration consistent between Mitaka and Master - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_MANAGE_FIREWALL=True" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" - export TEMPEST_CONCURRENCY=1 - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/ironic $PROJECTS" - export PROJECTS="openstack/ironic-lib $PROJECTS" - export PROJECTS="openstack/ironic-python-agent $PROJECTS" - export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" - export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="openstack/pyghmi $PROJECTS" - export PROJECTS="openstack/virtualbmc $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export DEVSTACK_GATE_CONFIGDRIVE=1 - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=direct" - export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}" - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - if [[ "$ZUUL_BRANCH" != "stable/ocata" && "$BRANCH_OVERRIDE" != "stable/ocata" ]]; then - export DEVSTACK_GATE_TLSPROXY=1 - fi - - # direct deploy requires Swift temporary URLs - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=secretkey" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0" - - export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1" - - # Ensure the ironic-vars-EARLY file exists - touch ironic-vars-early - # Pull in the EARLY variables injected by the optional builders - source ironic-vars-early - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" - - # Ensure the ironic-EXTRA-vars file exists - touch ironic-extra-vars - # Pull in the EXTRA variables injected by the optional builders - source ironic-extra-vars - - 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/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 86b9b92f24..691bcb17bf 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -226,3 +226,24 @@ c-sch: True c-vol: True cinder: True + +- job: + name: ironic-tempest-dsvm-ironic-inspector + description: ironic-tempest-dsvm-ironic-inspector + parent: ironic-base + required-projects: + - openstack/ironic-inspector + vars: + tempest_test_regex: InspectorBasicTest + devstack_localrc: + IRONIC_DEFAULT_DEPLOY_INTERFACE: direct + IRONIC_INSPECTOR_MANAGE_FIREWALL: True + IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True + IRONIC_VM_EPHEMERAL_DISK: 0 + devstack_plugins: + ironic-inspector: git://git.openstack.org/openstack/ironic-inspector + devstack_services: + s-account: True + s-container: True + s-object: True + s-proxy: True diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml index 7c8278a693..0ea31f53aa 100644 --- a/zuul.d/legacy-ironic-jobs.yaml +++ b/zuul.d/legacy-ironic-jobs.yaml @@ -65,23 +65,6 @@ timeout: 10800 nodeset: legacy-ubuntu-xenial-2-node -- job: - name: ironic-tempest-dsvm-ironic-inspector - parent: legacy-ironic-dsvm-base - run: playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/ironic - - openstack/ironic-inspector - - openstack/ironic-lib - - openstack/ironic-python-agent - - openstack/pyghmi - - openstack/python-ironic-inspector-client - - openstack/python-ironicclient - - openstack/tempest - - openstack/virtualbmc - # TODO(TheJulia): When we migrate to a non-legacy job, we will need to set the BUILD_TIMEOUT # and the DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT to 1200 seconds to prevent # needless CI job timeouts as the scale of the job is greater than a normal test jobs.