From a82e0d0fbd8e7907fd41de9c12b88d0682aa1b95 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Tue, 15 Jan 2019 14:21:29 -0500 Subject: [PATCH 1/5] Update .gitreview for f/stein Change-Id: Iacf7a42b99dbb8c09038aeb90cd5d7887798cc06 Signed-off-by: Scott Little --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index dd6a6ebd..843eee4c 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack/stx-tools.git +defaultbranch=f/stein From 9a3d804e0a2feeac7815334378356fb2411a746a Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Mon, 14 Jan 2019 11:37:37 -0600 Subject: [PATCH 2/5] Updating RPMs to be able to build stein clients Stein/Master clients required new RPMs or updated ones The old versions have been kept (for now) and will be removed by a later commit Story: 2004751 Task: 28867 Change-Id: Iea58cb9484c75cf757397d53d7d1576a2f436d81 Depends-On: I4e4b4768b4c0e64d03960bd42e9a1d342884e9a0 Signed-off-by: Al Bailey --- centos-mirror-tools/rpms_3rdparties.lst | 7 +++++++ centos-mirror-tools/rpms_centos.lst | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/centos-mirror-tools/rpms_3rdparties.lst b/centos-mirror-tools/rpms_3rdparties.lst index 2e3aade5..13a2b52b 100644 --- a/centos-mirror-tools/rpms_3rdparties.lst +++ b/centos-mirror-tools/rpms_3rdparties.lst @@ -13,3 +13,10 @@ python2-wheel-0.31.1-3.fc30.noarch.rpm#https://kojipkgs.fedoraproject.org/packag python3-wheel-0.31.1-3.fc30.noarch.rpm#https://kojipkgs.fedoraproject.org/packages/python-wheel/0.31.1/3.fc30/noarch/python3-wheel-0.31.1-3.fc30.noarch.rpm python2-pip-9.0.3-6.fc29.noarch.rpm#https://kojipkgs.fedoraproject.org/packages/python-pip/9.0.3/6.fc29/noarch/python2-pip-9.0.3-6.fc29.noarch.rpm python3-pip-9.0.3-6.fc29.noarch.rpm#https://kojipkgs.fedoraproject.org/packages/python-pip/9.0.3/6.fc29/noarch/python3-pip-9.0.3-6.fc29.noarch.rpm +python2-cliff-2.13.0-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-cliff/2.13.0/1.el7/noarch/python2-cliff-2.13.0-1.el7.noarch.rpm +python2-keystoneauth1-3.10.0-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-keystoneauth1/3.10.0/1.el7/noarch/python2-keystoneauth1-3.10.0-1.el7.noarch.rpm +python2-openstackdocstheme-1.23.2-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-openstackdocstheme/1.23.2/1.el7/noarch/python2-openstackdocstheme-1.23.2-1.el7.noarch.rpm +python2-os-service-types-1.3.0-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-os-service-types/1.3.0/1.el7/noarch/python2-os-service-types-1.3.0-1.el7.noarch.rpm +python2-osc-lib-1.11.1-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-osc-lib/1.11.1/1.el7/noarch/python2-osc-lib-1.11.1-1.el7.noarch.rpm +python2-osc-lib-tests-1.11.1-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-osc-lib/1.11.1/1.el7/noarch/python2-osc-lib-tests-1.11.1-1.el7.noarch.rpm +python2-sphinxcontrib-apidoc-0.2.1-6.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-sphinxcontrib-apidoc/0.2.1/6.el7/noarch/python2-sphinxcontrib-apidoc-0.2.1-6.el7.noarch.rpm diff --git a/centos-mirror-tools/rpms_centos.lst b/centos-mirror-tools/rpms_centos.lst index 2a72be52..52b80b62 100644 --- a/centos-mirror-tools/rpms_centos.lst +++ b/centos-mirror-tools/rpms_centos.lst @@ -1128,10 +1128,12 @@ python2-designateclient-2.7.0-1.el7.noarch.rpm python2-django-babel-0.4.0-2.el7.noarch.rpm python2-django-formtools-1.0-4.el7.noarch.rpm python2-dulwich-0.16.1-1.el7.x86_64.rpm +python2-extras-1.0.0-2.el7.noarch.rpm python2-fasteners-0.14.1-6.el7.noarch.rpm python2-fixtures-3.0.0-7.el7.noarch.rpm python2-funcsigs-1.0.2-4.el7.noarch.rpm python2-functools32-3.2.3.2-1.el7.noarch.rpm +python2-future-0.16.0-4.el7.noarch.rpm python2-futures-3.0.5-1.el7.noarch.rpm python2-futurist-1.3.0-1.el7.noarch.rpm python2-gabbi-1.33.0-1.el7.noarch.rpm @@ -1146,11 +1148,14 @@ python2-imagesize-0.7.1-5.el7.noarch.rpm python2-influxdb-4.0.0-1.el7.1.noarch.rpm python2-iso8601-0.1.11-7.el7.noarch.rpm python2-jinja2-2.8.1-1.el7.noarch.rpm +python2-jmespath-0.9.0-5.el7.noarch.rpm python2-json-logger-0.1.7-1.el7.noarch.rpm python2-jsonpatch-1.14-1.el7.noarch.rpm +python2-jsonpatch-1.21-1.el7.noarch.rpm python2-jsonpath-rw-ext-1.0.0-1.el7.noarch.rpm python2-jsonpointer-1.10-4.el7.noarch.rpm python2-jsonschema-2.5.1-3.el7.noarch.rpm +python2-keystonemiddleware-4.17.0-1.el7.noarch.rpm python2-kombu-4.0.2-5.el7.noarch.rpm python2-lz4-0.9.0-1.el7.x86_64.rpm python2-marathon-0.8.8-1.el7.noarch.rpm @@ -1163,6 +1168,7 @@ python2-mimeparse-1.6.0-4.el7.noarch.rpm python2-mock-2.0.0-1.el7.noarch.rpm python2-monascaclient-1.7.0-1.el7.noarch.rpm python2-mox3-0.23.0-1.el7.noarch.rpm +python2-munch-2.2.0-2.el7.noarch.rpm python2-murano-pkg-check-0.3.0-2.el7.noarch.rpm python2-numexpr-2.6.1-3.el7.x86_64.rpm python2-numpy-1.11.2-2.el7.x86_64.rpm @@ -1174,10 +1180,14 @@ python2-os-client-config-1.28.0-1.el7.noarch.rpm python2-oslo-cache-1.25.0-1.el7.noarch.rpm python2-oslo-concurrency-3.21.1-1.el7.noarch.rpm python2-oslo-config-4.11.0-1.el7.noarch.rpm +python2-oslo-config-5.2.0-1.el7.noarch.rpm python2-oslo-context-2.17.0-1.el7.noarch.rpm +python2-oslo-context-2.20.0-1.el7.noarch.rpm python2-oslo-db-4.25.0-1.el7.noarch.rpm python2-oslo-i18n-3.17.0-1.el7.noarch.rpm python2-oslo-log-3.30.0-1.el7.noarch.rpm +python2-oslo-log-3.36.0-1.el7.noarch.rpm +python-oslo-log-lang-3.36.0-1.el7.noarch.rpm python2-oslo-middleware-3.30.0-1.el7.noarch.rpm python2-oslo-policy-1.25.1-1.el7.noarch.rpm python2-oslo-privsep-1.22.0-1.el7.noarch.rpm @@ -1187,9 +1197,11 @@ python2-oslo-serialization-2.20.0-1.el7.noarch.rpm python2-oslo-sphinx-4.15.1-1.el7.noarch.rpm python2-oslotest-2.17.0-1.el7.noarch.rpm python2-oslo-utils-3.28.0-1.el7.noarch.rpm +python2-oslo-utils-3.35.1-1.el7.noarch.rpm python2-oslo-versionedobjects-1.26.0-1.el7.noarch.rpm python2-oslo-versionedobjects-tests-1.26.0-1.el7.noarch.rpm python2-oslo-vmware-2.23.0-1.el7.noarch.rpm +python2-osprofiler-1.11.0-1.el7.noarch.rpm python2-os-traits-0.3.3-1.el7.noarch.rpm python2-os-win-2.2.0-1.el7.noarch.rpm python2-os-xenapi-0.2.0-1.el7.noarch.rpm @@ -1214,6 +1226,7 @@ python2-pygments-2.2.0-7.el7.noarch.rpm python2-PyMySQL-0.7.11-1.el7.noarch.rpm python2-pyngus-2.2.4-1.el7.noarch.rpm python2-pyOpenSSL-16.2.0-3.el7.noarch.rpm +python2-pyOpenSSL-17.3.0-3.el7.noarch.rpm python2-pyparsing-2.1.10-3.el7.noarch.rpm python2-pyroute2-0.4.19-1.el7.noarch.rpm python2-pysaml2-3.0.2-2.el7.noarch.rpm @@ -1250,13 +1263,17 @@ python2-sphinx_rtd_theme-0.2.4-1.el7.noarch.rpm python2-sphinx-theme-alabaster-0.7.9-4.el7.noarch.rpm python2-sqlalchemy-1.1.11-1.el7.x86_64.rpm python2-statsd-3.2.1-5.el7.noarch.rpm +python2-stestr-1.1.0-1.el7.noarch.rpm python2-stevedore-1.25.0-1.el7.noarch.rpm +python2-subunit-1.2.0-14.el7.noarch.rpm python2-suds-0.7-0.4.94664ddd46a6.el7.noarch.rpm python2-swiftclient-3.4.0-1.el7.noarch.rpm python2-tables-3.3.0-4.el7.x86_64.rpm python2-taskflow-2.14.0-1.el7.noarch.rpm python2-tenacity-4.4.0-1.el7.noarch.rpm +python2-testrepository-0.0.20-12.el7.noarch.rpm python2-testresources-1.0.0-1.el7.noarch.rpm +python2-testscenarios-0.5.0-8.el7.noarch.rpm python2-tinyrpc-0.5-4.20170523git1f38ac.el7.noarch.rpm python2-traceback2-1.4.0-7.el7.noarch.rpm python2-troveclient-2.12.0-1.el7.noarch.rpm @@ -1287,6 +1304,7 @@ python2-XStatic-smart-table-1.4.13.2-1.el7.noarch.rpm python2-XStatic-termjs-0.0.7.0-1.el7.noarch.rpm python2-XStatic-tv4-1.2.7.0-0.1.pre_review.el7.noarch.rpm python2-yaql-1.1.0-3.el7.noarch.rpm +python2-yaql-1.1.3-2.el7.noarch.rpm python2-zake-0.2.2-2.el7.noarch.rpm python2-zaqarclient-1.7.0-1.el7.noarch.rpm python-alembic-0.8.10-1.el7.noarch.rpm @@ -1402,6 +1420,7 @@ python-oslo-policy-lang-1.25.1-1.el7.noarch.rpm python-oslo-privsep-lang-1.22.0-1.el7.noarch.rpm python-oslo-service-1.25.1-1.el7.src.rpm python-oslo-utils-lang-3.28.0-1.el7.noarch.rpm +python-oslo-utils-lang-3.35.1-1.el7.noarch.rpm python-oslo-versionedobjects-lang-1.26.0-1.el7.noarch.rpm python-oslo-vmware-lang-2.23.0-1.el7.noarch.rpm python-osprofiler-1.4.0-1.el7.noarch.rpm @@ -1442,6 +1461,7 @@ python-semantic_version-2.4.2-1.el7.noarch.rpm python-service-identity-14.0.0-4.el7.noarch.rpm python-setproctitle-1.1.9-4.el7.x86_64.rpm python-simplegeneric-0.8-7.el7.noarch.rpm +python-simplejson-3.5.3-5.el7.x86_64.rpm python-slip-0.4.0-4.el7.noarch.rpm python-slip-dbus-0.4.0-4.el7.noarch.rpm python-sphinx-locale-1.6.2-3.el7.noarch.rpm From 234a9480330be4c66355a3dc6a5029e85366d491 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Fri, 1 Feb 2019 08:51:28 -0600 Subject: [PATCH 3/5] Pulling in RPM for ceilometerclient This client needed for Horizon (pike) to launch. This client does not exist in stein, and so it will be removed once a stein version of Horizon is installed on the controller (story 2004765). Story: 2004751 Task: 29287 Change-Id: Iee76e932383493aea7d9fa0d18425f01e2f6a65d Signed-off-by: Al Bailey --- centos-mirror-tools/rpms_centos.lst | 1 + 1 file changed, 1 insertion(+) diff --git a/centos-mirror-tools/rpms_centos.lst b/centos-mirror-tools/rpms_centos.lst index 52b80b62..aabbe894 100644 --- a/centos-mirror-tools/rpms_centos.lst +++ b/centos-mirror-tools/rpms_centos.lst @@ -1109,6 +1109,7 @@ python2-bitmath-1.3.1-1.el7.noarch.rpm python2-boto-2.45.0-3.el7.noarch.rpm python2-cachez-0.1.0-2.el7.noarch.rpm python2-castellan-0.12.0-1.el7.noarch.rpm +python2-ceilometerclient-2.9.0-1.el7.noarch.rpm python2-certifi-2016.9.26-2.el7.noarch.rpm python2-colorama-0.3.7-2.el7.noarch.rpm python2-congressclient-1.8.0-1.el7.noarch.rpm From 12ca05299dea13c62952048e50a17d1ca354e328 Mon Sep 17 00:00:00 2001 From: Erich Cordoba Date: Tue, 19 Feb 2019 10:14:25 -0600 Subject: [PATCH 4/5] Move docker creation and deletion to tb.sh A makefile was used only for creation and clean up of the docker image for building. In this process, all the environment variables were sourced and included into the Makefile. However this can fail on systems that has functions and cause a failing makefile. Trying to fixing this issue I realize that this Makefile ain't needed, as all the logic for docker management is under `tb.sh`, therefore makes sense to remove this Makefile and use this script for the entire process. Story: 2002560 Change-Id: I2795593521a5d16dc2033861946fd09c2270424e Signed-off-by: Erich Cordoba --- Makefile | 44 -------------------------------------------- README.rst | 4 ++-- tb.sh | 26 ++++++++++++++++++++++++-- 3 files changed, 26 insertions(+), 48 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index c4ebff49..00000000 --- a/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# TC Build container - -# Set defaults that may be overridden in the buidrc -MY_TC_RELEASE := tis-r5-pike - -UID := $(shell id -u) -USER := $(shell id -un) - -# Import the build config -NULL := $(shell bash -c "source buildrc; set | sed -E '/^[[:alnum:]_]+/s/=/:=/' | sed 's/^//' > .makeenv") -include .makeenv - -MYUNAME ?= $(USER) - -TC_CONTAINER_NAME := $(MYUNAME)-centos-builder -TC_CONTAINER_TAG := local/$(MYUNAME)-stx-builder:7.4 -TC_DOCKERFILE := Dockerfile - -all: - docker build \ - --build-arg MYUID=$(UID) \ - --build-arg MYUNAME=$(MYUNAME) \ - --ulimit core=0 \ - --network host \ - -t $(TC_CONTAINER_TAG) \ - -f $(TC_DOCKERFILE) \ - . - -clean: - docker rm $(TC_CONTAINER_NAME) || true - docker image rm $(TC_CONTAINER_TAG) - -env: - @echo "TC_DOCKERFILE=$(TC_DOCKERFILE)" - @echo "TC_CONTAINER_NAME=$(TC_CONTAINER_NAME)" - @echo "TC_CONTAINER_TAG=$(TC_CONTAINER_TAG)" - @echo "SOURCE_REMOTE_NAME=$(SOURCE_REMOTE_NAME)" - @echo "SOURCE_REMOTE_URI=$(SOURCE_REMOTE_URI)" - @echo "HOST_MIRROR_DIR=$(HOST_MIRROR_DIR)" - @echo "MY_TC_RELEASE=$(MY_TC_RELEASE)" - @echo "LOCALDISK=${LOCALDISK}" - @echo "GUEST_LOCALDISK=${GUEST_LOCALDISK}" - -.PHONY: all clean env diff --git a/README.rst b/README.rst index ea298fe0..f8651023 100644 --- a/README.rst +++ b/README.rst @@ -54,11 +54,11 @@ Build image ~~~~~~~~~~~ Once the configuration files have been customized, it is possible to build -the docker image. This process is automated by the Makefile. +the docker image. This process is automated by the ``tb.sh`` script. .. code-block:: bash - make + ./tb.sh create NOTE: ~~~~~ diff --git a/tb.sh b/tb.sh index e0508dd3..90ce3cae 100755 --- a/tb.sh +++ b/tb.sh @@ -25,6 +25,17 @@ TC_CONTAINER_NAME=${MYUNAME}-centos-builder TC_CONTAINER_TAG=local/${MYUNAME}-stx-builder:7.4 TC_DOCKERFILE=Dockerfile +function create_container { + docker build \ + --build-arg MYUID=$(id -u) \ + --build-arg MYUNAME=${USER} \ + --ulimit core=0 \ + --network host \ + -t ${TC_CONTAINER_TAG} \ + -f ${TC_DOCKERFILE} \ + . +} + function exec_container { docker cp ${WORK_DIR}/buildrc ${TC_CONTAINER_NAME}:/home/${MYUNAME} docker cp ${WORK_DIR}/localrc ${TC_CONTAINER_NAME}:/home/${MYUNAME} @@ -57,8 +68,13 @@ function kill_container { docker kill ${TC_CONTAINER_NAME} } +function clean_container { + docker rm ${TC_CONTAINER_NAME} || true + docker image rm ${TC_CONTAINER_TAG} +} + function usage { - echo "$0 [run|exec|env|stop|kill]" + echo "$0 [create|run|exec|env|stop|kill|clean]" } case $CMD in @@ -74,6 +90,9 @@ case $CMD in echo "MY_TC_RELEASE=${MY_TC_RELEASE}" echo "MY_REPO_ROOT_DIR=${MY_REPO_ROOT_DIR}" ;; + create) + create_container + ;; exec) exec_container ;; @@ -86,9 +105,12 @@ case $CMD in kill) kill_container ;; + clean) + clean_container + ;; *) echo "Unknown command: $CMD" - usage + usage exit 1 ;; esac From 8a7d023278fe1538b53d467ce4cd7bf663506999 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Wed, 30 Jan 2019 08:23:07 -0600 Subject: [PATCH 5/5] Remove default value of TAG from branch-stx.sh This turned out to be less useful and more painful than anticipated so do not set a default value for TAG. Also remove the -b option that was used to hack around this default value. Change-Id: I7b268e6798a4e9b6adf845401f8dcc89a4be32ac Signed-off-by: Dean Troyer --- release/branch-stx.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/release/branch-stx.sh b/release/branch-stx.sh index f82af92d..8075242f 100755 --- a/release/branch-stx.sh +++ b/release/branch-stx.sh @@ -6,8 +6,6 @@ # --dry-run|-n Do all work except pushing back to the remote repo. # Useful to validate everything locally before pushing. # -# -b Set branch only (sets TAG="") -# # -l List the repo URLS that would be processed and exit # # -m Extract the repo list from for starlingx @@ -37,8 +35,8 @@ # branch is not named 'master'. When SRC_BRANCH == BRANCH this is effectively # a tag-only operation. # -# TAG is the release tag that represents the actual release, derived by adding -# a 'patch' version to SERIES, initially '0'. If TAG is unset no tag is created. +# TAG is the release tag that represents the actual release. If TAG is unset +# no tag is created. # # Notes: # * This script is used for creating milestone, release and feature branches. @@ -73,7 +71,8 @@ while getopts "$optspec" o; do esac ;; b) - BRANCH_ONLY=1 + : + # left for backward-compatibility, unused ;; l) LIST=1 @@ -105,16 +104,11 @@ SERIES=${SERIES:-$(date '+%Y.%m')} BRANCH=${BRANCH:-m/$SERIES} # tag: YYYY.MM.0 -TAG=${TAG:-$SERIES.0} +TAG=${TAG:-""} # The list of remotes to extract from MANIFEST REMOTES="starlingx stx-staging" -if [[ -n $BRANCH_ONLY ]]; then - # Force tag to be empty - TAG="" -fi - if [[ -n $TAG_ONLY ]]; then # Force source and target branches to be the same SRC_BRANCH=${BRANCH} @@ -226,7 +220,7 @@ fi for i in $repo_list; do if [[ -z $LIST ]]; then - branch_repo $i HEAD $BRANCH $TAG + branch_repo "$i" HEAD "$BRANCH" "$TAG" else echo "$i" fi