From 60d24ec9429f222bdae831b98bd0d3e6eb36d853 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 29 Jul 2019 16:34:39 +0200 Subject: [PATCH] CI: stop using pyghmi from git master It's just a library we consume, there is no reason to use its git head. Currently 1.4.0 is breaking us. The stable version of this patch was reworked to cover legacy jobs. Story: #2006301 Task: #36014 Change-Id: Ib1b1e32bc60d7ec271098dcd17086f79518c09df (cherry picked from commit 3dfce5f2de6377d74632bb2a7fe3d382ccc629b0) --- .../grenade-dsvm-ironic-multinode-multitenant/run.yaml | 1 - playbooks/legacy/grenade-dsvm-ironic/run.yaml | 1 - playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml | 1 - .../legacy/tempest-dsvm-ironic-functional-python2/run.yaml | 1 - .../legacy/tempest-dsvm-ironic-functional-python3/run.yaml | 1 - playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml | 1 - .../run.yaml | 1 - playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml | 1 - zuul.d/ironic-jobs.yaml | 1 - zuul.d/legacy-ironic-jobs.yaml | 5 ----- 10 files changed, 14 deletions(-) diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index 92c11ce4f8..b369a2ba34 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -118,7 +118,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="x/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 diff --git a/playbooks/legacy/grenade-dsvm-ironic/run.yaml b/playbooks/legacy/grenade-dsvm-ironic/run.yaml index b0d855f56d..63fd40dbaa 100644 --- a/playbooks/legacy/grenade-dsvm-ironic/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic/run.yaml @@ -65,7 +65,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="x/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 diff --git a/playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml index d28f5451e8..7d401b7cdc 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml @@ -40,7 +40,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="x/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 diff --git a/playbooks/legacy/tempest-dsvm-ironic-functional-python2/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-functional-python2/run.yaml index d5a793e505..c3e0730298 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-functional-python2/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-functional-python2/run.yaml @@ -54,7 +54,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="x/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 diff --git a/playbooks/legacy/tempest-dsvm-ironic-functional-python3/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-functional-python3/run.yaml index 73e171d237..bb2e73ac67 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-functional-python3/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-functional-python3/run.yaml @@ -29,7 +29,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="x/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 diff --git a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml index a932ac8fc2..208e86eb4d 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml @@ -35,7 +35,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="x/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml index d5bfc8460f..ef8537c727 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml @@ -58,7 +58,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="x/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 diff --git a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml index 09d913af59..98a26c47ff 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml @@ -33,7 +33,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" - export PROJECTS="x/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 8f451d3eae..b7714733c6 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -7,7 +7,6 @@ - openstack/ironic - openstack/ironic-python-agent - openstack/ironic-tempest-plugin - - x/pyghmi - openstack/virtualbmc irrelevant-files: - ^.*\.rst$ diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml index b03f70e011..960fe046b8 100644 --- a/zuul.d/legacy-ironic-jobs.yaml +++ b/zuul.d/legacy-ironic-jobs.yaml @@ -20,7 +20,6 @@ - openstack/ironic-lib - openstack/ironic-python-agent - openstack/ironic-tempest-plugin - - x/pyghmi - openstack/python-ironicclient - openstack/virtualbmc pre-run: playbooks/legacy/ironic-dsvm-base/pre.yaml @@ -52,7 +51,6 @@ - openstack/ironic-python-agent - openstack/ironic-tempest-plugin - openstack/networking-generic-switch - - x/pyghmi - openstack/python-ironicclient - openstack/virtualbmc pre-run: playbooks/legacy/ironic-dsvm-base-multinode/pre.yaml @@ -82,7 +80,6 @@ - openstack/ironic-inspector - openstack/ironic-lib - openstack/ironic-python-agent - - x/pyghmi - openstack/python-ironic-inspector-client - openstack/python-ironicclient - openstack/tempest @@ -102,7 +99,6 @@ - openstack/ironic - openstack/ironic-lib - openstack/ironic-python-agent - - x/pyghmi - openstack/python-ironicclient - openstack/virtualbmc @@ -118,7 +114,6 @@ - openstack/ironic-lib - openstack/ironic-python-agent - openstack/networking-generic-switch - - x/pyghmi - openstack/python-ironicclient - openstack/virtualbmc nodeset: legacy-ubuntu-xenial-2-node