From 149cfa12486014b24f4023d74e9e1da1eab82b64 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Tue, 26 Jan 2021 12:27:40 +0100 Subject: [PATCH] Use CentOS 8 Stream tags for deps in master release This is part of RDO transition to CentOS 8 Stream. New cloud8s-openstack-wallaby-* tags have been created in CBS and populated in [1]. Now it's time to switch update-deps.sh to use those new tags to synchronize dependencies from CBS. Note that existing cloud8-openstack-wallaby-* buildsys-tags will be removed from rdoinfo and the dependencies updates must be done using cloud8s-openstack-wallaby-testing. [1] https://review.rdoproject.org/r/#/c/31670/ Change-Id: Ifea01cab7beb17e4ff3edbc78da73602fd22a0e3 --- files/update-deps.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/files/update-deps.sh b/files/update-deps.sh index a4516ff..8abcba8 100644 --- a/files/update-deps.sh +++ b/files/update-deps.sh @@ -12,15 +12,22 @@ RDOINFO_LOCATION=${RDOINFO_LOCATION:-/home/rdoinfo/rdoinfo} DATE_VERSION=$(date +%Y%m%d%H%M) RSYNC_REMOTE=${RSYNC_REMOTE:-1} TAG_PHASE=${TAG_PHASE:-testing} +STREAM_RELEASES="master-uc wallaby" # Find CentOS version case $(echo $USER|cut -d'-' -f1) in centos) CENTOS_RELEASE=7 + TAG_PREFFIX="cloud7" ;; centos8) CENTOS_RELEASE=8 + if [ $(echo $STREAM_RELEASES|grep -c $RELEASE) -ne 0 ]; then + TAG_PREFFIX="cloud8s" + else + TAG_PREFFIX="cloud8" + fi ;; esac @@ -55,9 +62,9 @@ fi echo "INFO: synchronizing dependencies revision $DATE_VERSION to $LATEST_DEPS_DIR" if [ $RELEASE = "master-uc" ]; then - CBS_TAG=${CBS_TAG:-"cloud${CENTOS_RELEASE}-openstack-${MASTER_TAG}-${TAG_SUFFIX}"} + CBS_TAG=${CBS_TAG:-"${TAG_PREFFIX}-openstack-${MASTER_TAG}-${TAG_SUFFIX}"} else - CBS_TAG=${CBS_TAG:-"cloud${CENTOS_RELEASE}-openstack-${RELEASE}-${TAG_SUFFIX}"} + CBS_TAG=${CBS_TAG:-"${TAG_PREFFIX}-openstack-${RELEASE}-${TAG_SUFFIX}"} fi TEMPDIR=$(mktemp -d)