From f3febea043841c98ffa479493e9f335e2d2b8e4b Mon Sep 17 00:00:00 2001 From: "anthony.bellino" Date: Fri, 30 Apr 2021 11:34:33 -0700 Subject: [PATCH] Gate stability improvements Installing Deckhand req. can be problematic which also installs pbr for the ubuntu_xenial image. * Install requirements sequential for ubuntu_xenial image * Install pbr before Deckhand Change-Id: I647fa42beb749d4b0cbf3278509780777d82334b --- images/promenade/Dockerfile.ubuntu_xenial | 2 +- requirements-frozen.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/promenade/Dockerfile.ubuntu_xenial b/images/promenade/Dockerfile.ubuntu_xenial index c4c2c7bc..ca9b0864 100644 --- a/images/promenade/Dockerfile.ubuntu_xenial +++ b/images/promenade/Dockerfile.ubuntu_xenial @@ -78,7 +78,7 @@ RUN set -ex \ && rm -fr libyaml COPY requirements-frozen.txt /opt/promenade -RUN pip3 install --no-cache-dir -r requirements-frozen.txt +RUN cat requirements-frozen.txt | xargs -d '\n' -l1 pip3 install --no-cache-dir # Setting promenade version for BPR ENV PBR_VERSION 0.8.0 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 812bc8b9..da2f08bf 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -12,6 +12,7 @@ cliff==3.1.0 cmd2==0.8.9 cryptography==3.1.1 debtcollector==1.22.0 +pbr==5.4.5 Deckhand @ git+https://opendev.org/airship/deckhand.git@1f0c011a1708c1235a2be65edada7d386cd55d2a#egg=deckhand decorator==4.4.2 deepdiff==3.3.0 @@ -64,7 +65,6 @@ oslo.service==1.41.1 oslo.utils==3.42.1 Paste==3.0.1 PasteDeploy==1.5.2 -pbr==5.4.5 ply==3.11 prettytable==0.7.2 psycopg2==2.7.5