starlingx/tools
Code Issues Proposed changes

Merge "Remove TC reference from RELEASE Variable and config scripts"

Browse Source
This commit is contained in:
Zuul 2020-03-09 21:02:28 +00:00 committed by Gerrit Code Review
commit 6279b3f773
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@ -157,14 +157,14 @@ RUN cd /opt/mock_overlay && \
make install make install
# ENV setup # ENV setup
RUN echo "# Load stx-builder configuration" >> /etc/profile.d/TC.sh && \ RUN echo "# Load stx-builder configuration" >> /etc/profile.d/stx-builder-conf.sh && \
echo "if [[ -r \${HOME}/buildrc ]]; then" >> /etc/profile.d/TC.sh && \ echo "if [[ -r \${HOME}/buildrc ]]; then" >> /etc/profile.d/stx-builder-conf.sh && \
echo " source \${HOME}/buildrc" >> /etc/profile.d/TC.sh && \ echo " source \${HOME}/buildrc" >> /etc/profile.d/stx-builder-conf.sh && \
echo " export PROJECT SRC_BUILD_ENVIRONMENT MYPROJECTNAME MYUNAME" >> /etc/profile.d/TC.sh && \ echo " export PROJECT SRC_BUILD_ENVIRONMENT MYPROJECTNAME MYUNAME" >> /etc/profile.d/stx-builder-conf.sh && \
echo " export MY_BUILD_CFG MY_BUILD_CFG_RT MY_BUILD_CFG_STD MY_BUILD_DIR MY_BUILD_ENVIRONMENT MY_BUILD_ENVIRONMENT_FILE MY_BUILD_ENVIRONMENT_FILE_RT MY_BUILD_ENVIRONMENT_FILE_STD MY_DEBUG_BUILD_CFG_RT MY_DEBUG_BUILD_CFG_STD MY_LOCAL_DISK MY_MOCK_ROOT MY_REPO MY_REPO_ROOT_DIR MY_SRC_RPM_BUILD_DIR MY_TC_RELEASE MY_WORKSPACE LAYER" >> /etc/profile.d/TC.sh && \ echo " export MY_BUILD_CFG MY_BUILD_CFG_RT MY_BUILD_CFG_STD MY_BUILD_DIR MY_BUILD_ENVIRONMENT MY_BUILD_ENVIRONMENT_FILE MY_BUILD_ENVIRONMENT_FILE_RT MY_BUILD_ENVIRONMENT_FILE_STD MY_DEBUG_BUILD_CFG_RT MY_DEBUG_BUILD_CFG_STD MY_LOCAL_DISK MY_MOCK_ROOT MY_REPO MY_REPO_ROOT_DIR MY_SRC_RPM_BUILD_DIR MY_RELEASE MY_WORKSPACE LAYER" >> /etc/profile.d/stx-builder-conf.sh && \
echo "fi" >> /etc/profile.d/TC.sh && \ echo "fi" >> /etc/profile.d/stx-builder-conf.sh && \
echo "export FORMAL_BUILD=0" >> /etc/profile.d/TC.sh && \ echo "export FORMAL_BUILD=0" >> /etc/profile.d/stx-builder-conf.sh && \
echo "export PATH=\$MY_REPO/build-tools:\$PATH" >> /etc/profile.d/TC.sh echo "export PATH=\$MY_REPO/build-tools:\$PATH" >> /etc/profile.d/stx-builder-conf.sh
# centos locales are broken. this needs to be run after the last yum install/update # centos locales are broken. this needs to be run after the last yum install/update
RUN localedef -i en_US -f UTF-8 en_US.UTF-8 RUN localedef -i en_US -f UTF-8 en_US.UTF-8

8
buildrc
View File

@ -1,4 +1,4 @@
# Common configuration for TC tbuilder # Common configuration for StarlingX builder
[[ -z "$_BUILDRC" ]] || return 0 [[ -z "$_BUILDRC" ]] || return 0
declare -r -g _BUILDRC=1 declare -r -g _BUILDRC=1
@ -49,8 +49,8 @@ GUEST_LOCALDISK=${GUEST_LOCALDISK%/}
LOCALDISK=${HOST_PREFIX}/${GUEST_LOCALDISK} LOCALDISK=${HOST_PREFIX}/${GUEST_LOCALDISK}
# TC vars # Release Variable
export MY_TC_RELEASE=${MY_TC_RELEASE:-tis-r5-pike} export MY_RELEASE=${MY_RELEASE:-3.0}
# Default branch to build # Default branch to build
export BRANCH=${BRANCH:-intel_r0} export BRANCH=${BRANCH:-intel_r0}
@ -62,7 +62,7 @@ export PROJECT=${PROJECT:-test}
export MYUNAME=${MYUNAME:-builder} export MYUNAME=${MYUNAME:-builder}
export MYPROJECTNAME=${PROJECT:-frog1} export MYPROJECTNAME=${PROJECT:-frog1}
export SRC_BUILD_ENVIRONMENT=${SRC_BUILD_ENVIRONMENT:-$MY_TC_RELEASE} export SRC_BUILD_ENVIRONMENT=${SRC_BUILD_ENVIRONMENT:-$MY_RELEASE}
# All of the below are dependent on variables defined earlier, right now # All of the below are dependent on variables defined earlier, right now
# we are not going to support directly setting them in localrc # we are not going to support directly setting them in localrc

2
tb.sh
View File

@ -87,7 +87,7 @@ case $CMD in
echo "SOURCE_REMOTE_NAME=${SOURCE_REMOTE_NAME}" echo "SOURCE_REMOTE_NAME=${SOURCE_REMOTE_NAME}"
echo "SOURCE_REMOTE_URI=${SOURCE_REMOTE_URI}" echo "SOURCE_REMOTE_URI=${SOURCE_REMOTE_URI}"
echo "HOST_MIRROR_DIR=${HOST_MIRROR_DIR}" echo "HOST_MIRROR_DIR=${HOST_MIRROR_DIR}"
echo "MY_TC_RELEASE=${MY_TC_RELEASE}" echo "MY_RELEASE=${MY_RELEASE}"
echo "MY_REPO_ROOT_DIR=${MY_REPO_ROOT_DIR}" echo "MY_REPO_ROOT_DIR=${MY_REPO_ROOT_DIR}"
echo "LAYER=${LAYER}" echo "LAYER=${LAYER}"
;; ;;

2
toCOPY/finishSetup.sh
View File

@ -33,7 +33,7 @@ sudo chown root:mock /localdisk/loadbuild/mock-cache
# 78 mkdir -p $MY_WORKSPACE/rt/rpmbuild/RPMS # 78 mkdir -p $MY_WORKSPACE/rt/rpmbuild/RPMS
# make the place we will clone into # make the place we will clone into
. /etc/profile.d/TC.sh . /etc/profile.d/stx-builder-conf.sh
echo "MY_REPO=$MY_REPO" echo "MY_REPO=$MY_REPO"
mkdir -p $MY_REPO mkdir -p $MY_REPO
mkdir -p $MY_WORKSPACE mkdir -p $MY_WORKSPACE