From 6cd1a25b052e8630957e0d92fc7e2e3ff14826d8 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Fri, 29 Jun 2018 15:29:25 -0400 Subject: [PATCH] Shorten "addons/wr-cgcs/layers/cgcs" to just "stx" Part of the project to remove cgcs references. Replace and shorten the path the needlessly long and complex "addons/wr-cgcs/layers/cgcs" path with just "stx". This update just fixes up paths found in scripts, comments and config files. Depends-On: https://review.openstack.org/579954 Depends-On: https://review.openstack.org/579957 Depends-On: https://review.openstack.org/580170 Depends-On: https://review.openstack.org/579979 Change-Id: I6fa7591a365aadf5f9f458ed0d972223a52a935b Signed-off-by: Scott Little --- extras/scripts/make_patch.sh | 3 +-- extras/scripts/modify_patch.sh | 3 +-- extras/scripts/patch_build.sh | 8 ++++++-- extras/scripts/query_patch.sh | 3 +-- .../recipes-common/build-info/build-info-1.0/collect.sh | 4 ++-- .../recipes-common/engtools/hostdata-collectors/README | 2 +- .../engtools/hostdata-collectors/patch-engtools.sh | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/extras/scripts/make_patch.sh b/extras/scripts/make_patch.sh index 3a64554..e944ec8 100755 --- a/extras/scripts/make_patch.sh +++ b/extras/scripts/make_patch.sh @@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd` popd > /dev/null -# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch -CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch +CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch # Set environment variables for python export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch diff --git a/extras/scripts/modify_patch.sh b/extras/scripts/modify_patch.sh index 91cdff2..2155ee6 100755 --- a/extras/scripts/modify_patch.sh +++ b/extras/scripts/modify_patch.sh @@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd` popd > /dev/null -# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch -CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch +CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch # Set environment variables for python export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch diff --git a/extras/scripts/patch_build.sh b/extras/scripts/patch_build.sh index e1f4cd0..6dc9e9a 100755 --- a/extras/scripts/patch_build.sh +++ b/extras/scripts/patch_build.sh @@ -1,9 +1,13 @@ #!/bin/bash -CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch +pushd `dirname $0` > /dev/null +SCRIPTPATH=`pwd` +popd > /dev/null + +CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch # Source release-info -. $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc +. $SCRIPTPATH/../../middleware/recipes-common/build-info/release-info.inc export PLATFORM_RELEASE # Set environment variables for python diff --git a/extras/scripts/query_patch.sh b/extras/scripts/query_patch.sh index be89ce3..dbee355 100755 --- a/extras/scripts/query_patch.sh +++ b/extras/scripts/query_patch.sh @@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd` popd > /dev/null -# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch -CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch +CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch # Set environment variables for python export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch diff --git a/middleware/recipes-common/build-info/build-info-1.0/collect.sh b/middleware/recipes-common/build-info/build-info-1.0/collect.sh index b7c3427..8d06f6a 100755 --- a/middleware/recipes-common/build-info/build-info-1.0/collect.sh +++ b/middleware/recipes-common/build-info/build-info-1.0/collect.sh @@ -77,9 +77,9 @@ else echo "WRS_GIT_BRANCH=\"$WRS_GIT_BRANCH\"" >> $destFile fi - echo "CGCS_SRC_DIR=\"$REPO/addons/wr-cgcs/layers/cgcs\"" >> $destFile + echo "CGCS_SRC_DIR=\"$REPO/stx\"" >> $destFile if [ "${CGCS_GIT_BRANCH}x" == "x" ]; then - echo "CGCS_GIT_BRANCH=\""`cd $REPO/addons/wr-cgcs/layers/cgcs/; git status -s -b | grep '##' | awk ' { printf $2 } '`"\"" >> $destFile + echo "CGCS_GIT_BRANCH=\""`cd $REPO/stx/; git status -s -b | grep '##' | awk ' { printf $2 } '`"\"" >> $destFile else echo "CGCS_GIT_BRANCH=\"$CGCS_GIT_BRANCH\"" >> $destFile fi diff --git a/middleware/util/recipes-common/engtools/hostdata-collectors/README b/middleware/util/recipes-common/engtools/hostdata-collectors/README index a5174af..b33a91d 100644 --- a/middleware/util/recipes-common/engtools/hostdata-collectors/README +++ b/middleware/util/recipes-common/engtools/hostdata-collectors/README @@ -2,7 +2,7 @@ The Engineering tools is meant to be installed as a patch. Therefore, the RPM is of the build but is not included in the image. Assuming your development environment is fully set up, simply run patch-engtools.sh to generate the patch: -In this directory ($MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/util/recipes-common/engtools/hostdata-collectors), +In this directory ($MY_REPO/stx/middleware/util/recipes-common/engtools/hostdata-collectors), enter the command: >./patch-engtools.sh diff --git a/middleware/util/recipes-common/engtools/hostdata-collectors/patch-engtools.sh b/middleware/util/recipes-common/engtools/hostdata-collectors/patch-engtools.sh index bf9a73d..aeac245 100755 --- a/middleware/util/recipes-common/engtools/hostdata-collectors/patch-engtools.sh +++ b/middleware/util/recipes-common/engtools/hostdata-collectors/patch-engtools.sh @@ -14,7 +14,7 @@ if [ $? -ne 0 ]; then exit 1 fi -source ${MY_REPO}/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc +source ${MY_REPO}/stx/middleware/recipes-common/build-info/release-info.inc #TiS_REL="16.10" #PATCH_ID="ENGTOOLS-${TiS_REL}" PATCH_ID="ENGTOOLS-${PLATFORM_RELEASE}" @@ -23,7 +23,7 @@ PWD=$(pwd) # Create CGCS Patch cd ${MY_WORKSPACE} -PATCH_BUILD=${MY_REPO}/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/patch_build.sh +PATCH_BUILD=${MY_REPO}/stx/extras/scripts/patch_build.sh ${PATCH_BUILD} --id ${PATCH_ID} --reboot-required=N \ --summary "System engineering data collection and analysis tools." \ --desc "System engineering data collection and analysis tools." \