From 7e009c1d87eca98976592197e4a58783140ac14f Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Tue, 4 Aug 2020 11:27:33 -0700 Subject: [PATCH] Pin Ironic Tempest Plugin Pin the ironic-tempest-plugin to an older version so we don't run the net set of tests with wholedisk + partition testing. Also removes CoreOS jobs as CoreOS is EOL and no longer receiving any updates. And also signals to the user to try and manually install python-pip as opposed to install the package from the package manager as older mirrors have older versions at this point and we are risking breaking things by automatically doing so. This should fix test jobs on ubuntu-xenial as there is a conflict in the repositories. python-pip : Depends: python-pip-whl (= 8.1.1-2ubuntu0.4) but 9.0.1-3~3 is to be installed Change-Id: I6b689bd16dfe6fa849e876f056f1c5cfd1937764 (cherry picked from commit c7b3d9f062f6ca23c8a394aa528d5097d3b6b9f4) --- imagebuild/tinyipa/install-deps.sh | 6 +++++- zuul.d/legacy-ironic-jobs.yaml | 3 ++- zuul.d/project.yaml | 8 -------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/imagebuild/tinyipa/install-deps.sh b/imagebuild/tinyipa/install-deps.sh index 1c055544d..8bd7a88d3 100755 --- a/imagebuild/tinyipa/install-deps.sh +++ b/imagebuild/tinyipa/install-deps.sh @@ -1,6 +1,10 @@ #!/bin/bash -COMMON_PACKAGES="wget python-pip unzip sudo gawk" +if ! $(pip -V &>/dev/null); then + echo "Warning: Please install python-pip manually" + exit 1 +fi +COMMON_PACKAGES="wget unzip sudo gawk" APT_PACKAGES="${COMMON_PACKAGES} squashfs-tools" YUM_PACKAGES="${COMMON_PACKAGES} squashfs-tools" ZYPPER_PACKAGES="${COMMON_PACKAGES} squashfs" diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml index f52e4c6f8..5520efa90 100644 --- a/zuul.d/legacy-ironic-jobs.yaml +++ b/zuul.d/legacy-ironic-jobs.yaml @@ -17,7 +17,8 @@ - openstack/ironic - openstack/ironic-lib - openstack/ironic-python-agent - - openstack/ironic-tempest-plugin + - name: openstack/ironic-tempest-plugin + override-checkout: 1.2.1 - x/pyghmi - openstack/python-ironicclient - openstack/tempest diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index ecef1bbe6..fb1cec8af 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -7,13 +7,9 @@ - release-notes-jobs check: jobs: - - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src - - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src - - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src - - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src # Non-voting jobs - ipa-tempest-dsvm-ironic-inspector-src: @@ -23,13 +19,9 @@ gate: queue: ironic jobs: - - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src - - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src - - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src - - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src experimental: jobs: