diff options
| -rw-r--r-- | playbooks/legacy/ironic-dsvm-functional/run.yaml | 42 | ||||
| -rw-r--r-- | playbooks/legacy/tempest-dsvm-ironic-parallel/run.yaml | 34 | ||||
| -rw-r--r-- | playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml | 80 | ||||
| -rw-r--r-- | zuul.d/legacy-ironic-jobs.yaml | 30 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 5 |
5 files changed, 0 insertions, 191 deletions
diff --git a/playbooks/legacy/ironic-dsvm-functional/run.yaml b/playbooks/legacy/ironic-dsvm-functional/run.yaml deleted file mode 100644 index 964bdcfa5..000000000 --- a/playbooks/legacy/ironic-dsvm-functional/run.yaml +++ /dev/null @@ -1,42 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ironic-dsvm-functional from old job gate-ironic-dsvm-functional-ubuntu-xenial - tasks: - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin ironic git://git.openstack.org/openstack/ironic - - 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_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export TEMPEST_CONCURRENCY=2 - export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}" - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_TEMPEST_REGEX='ironic' - export PROJECTS="openstack/ironic $PROJECTS" - export PROJECTS="openstack/ironic-python-agent $PROJECTS" - - # 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 }}' diff --git a/playbooks/legacy/tempest-dsvm-ironic-parallel/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-parallel/run.yaml deleted file mode 100644 index c25bba1f4..000000000 --- a/playbooks/legacy/tempest-dsvm-ironic-parallel/run.yaml +++ /dev/null @@ -1,34 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-ironic-parallel from old job gate-tempest-dsvm-ironic-parallel-ubuntu-xenial-nv - tasks: - - - 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/python-ironicclient $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - # NOTE(deva): tempest-lib support was added in Mitaka - # but this job does not run on stable branches, so we can keep it simple here - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_VIRT_DRIVER=ironic - export DEVSTACK_GATE_CONFIGDRIVE=1 - export TEMPEST_CONCURRENCY=2 - export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}" - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # Run only baremetal tests - export DEVSTACK_GATE_TEMPEST_REGEX="ironic_tempest_plugin.tests.scenario" - - 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-ironic-pxe_ipa-full/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml deleted file mode 100644 index 82722a0c6..000000000 --- a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-ironic-pxe_ipa-full from old job gate-tempest-dsvm-ironic-pxe_ipa-full-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_FULL=1 - - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-vars-early - # use tempest plugin - 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=iscsi" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_RESCUE_INTERFACE=agent" - 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 - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1" - - 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=7" - - # 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/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml index 0ea31f53a..aff811a28 100644 --- a/zuul.d/legacy-ironic-jobs.yaml +++ b/zuul.d/legacy-ironic-jobs.yaml @@ -101,36 +101,6 @@ nodeset: legacy-ubuntu-xenial-2-node - job: - name: ironic-dsvm-functional - parent: legacy-ironic-dsvm-base - run: playbooks/legacy/ironic-dsvm-functional/run.yaml - timeout: 4800 - required-projects: - - openstack-infra/devstack-gate - - openstack/ironic - - openstack/ironic-python-agent - -- job: - name: ironic-tempest-dsvm-parallel - parent: legacy-ironic-dsvm-base - run: playbooks/legacy/tempest-dsvm-ironic-parallel/run.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/ara - - openstack/ironic - - openstack/ironic-lib - - openstack/ironic-python-agent - - openstack/python-ironicclient - - openstack/tempest - -- job: - name: ironic-tempest-dsvm-pxe_ipa-full - parent: legacy-ironic-dsvm-base - run: playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml - timeout: 9600 - -- job: name: ironic-tempest-dsvm-functional-python2 parent: legacy-ironic-dsvm-base run: playbooks/legacy/tempest-dsvm-ironic-functional-python2/run.yaml diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b3e265969..eab5c4d6a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -47,8 +47,3 @@ - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa-indirect - ironic-tempest-dsvm-ipa-partition-bios-agent_ipmitool-tinyipa-indirect - experimental: - jobs: - - ironic-dsvm-functional - - ironic-tempest-dsvm-parallel - - ironic-tempest-dsvm-pxe_ipa-full |