From a5eaf207825951edea3630abea6c0f7d3a0992cf 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 --- 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 ccf67d842..769678cf5 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.5.1 - openstack/python-ironicclient - openstack/tempest - openstack/virtualbmc diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 8be8b938b..e8b63bbc1 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-ipmi-direct-coreos-src - ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src - - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src - - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src - - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src # Non-voting jobs - ipa-tempest-dsvm-ironic-inspector-src: @@ -24,13 +20,9 @@ gate: queue: ironic jobs: - - ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src - ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src - - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src - - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src - - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src - openstack-tox-lower-constraints experimental: