starlingx/jenkins-pipelines
Code Issues Proposed changes

Rename env function to avoid conflicts

Browse Source 
lib/job_utils.sh: function "require_env" conflicts with the like-named
function in utils.sh. Rename it to "require_job_env".

Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
Change-Id: I557cf14c4a3df000be245471cef5663e49badb06
This commit is contained in:
Davlet Panech 2022-09-02 13:51:45 -04:00
parent e9e78fb22c
commit 8014360154
28 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/archive-docker-images.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_STREAM require_job_env BUILD_STREAM
load_build_env load_build_env

2
scripts/archive-iso.sh
View File

@ -10,7 +10,7 @@ set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
load_build_env load_build_env
require_env BUILD_ISO require_job_env BUILD_ISO
LAT_SUBDIR="localdisk/deploy" LAT_SUBDIR="localdisk/deploy"

2
scripts/archive-packages.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_RT require_job_env BUILD_RT
load_build_env load_build_env

2
scripts/archive-prerequisites.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_RT require_job_env BUILD_RT
load_build_env load_build_env

2
scripts/archive-wheels.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_STREAM require_job_env BUILD_STREAM
load_build_env load_build_env

16
scripts/build-docker-base.sh
View File

@ -9,13 +9,13 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env DRY_RUN require_job_env DRY_RUN
require_env USE_DOCKER_CACHE require_job_env USE_DOCKER_CACHE
require_env BUILD_STREAM stable require_job_env BUILD_STREAM stable
require_env PUSH_DOCKER_IMAGES require_job_env PUSH_DOCKER_IMAGES
declare_env PUBLISH_ROOT_URL declare_job_env PUBLISH_ROOT_URL
declare_env DOCKER_IMAGE_BASE declare_job_env DOCKER_IMAGE_BASE
load_build_env load_build_env
@ -48,7 +48,7 @@ fi
if $USE_POD_URLS_IN_DOCKER_IMAGES ; then if $USE_POD_URLS_IN_DOCKER_IMAGES ; then
cmd+=("--local") cmd+=("--local")
else else
require_env PUBLISH_ROOT_URL require_job_env PUBLISH_ROOT_URL
cmd+=("--repo 'deb [trusted=yes check-valid-until=0] $PUBLISH_URL/inputs/packages ./'") cmd+=("--repo 'deb [trusted=yes check-valid-until=0] $PUBLISH_URL/inputs/packages ./'")
cmd+=("--repo 'deb [trusted=yes check-valid-until=0] $PUBLISH_URL/outputs/std/packages ./'") cmd+=("--repo 'deb [trusted=yes check-valid-until=0] $PUBLISH_URL/outputs/std/packages ./'")
fi fi

20
scripts/build-docker-images.sh
View File

@ -9,19 +9,19 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env DRY_RUN require_job_env DRY_RUN
require_env USE_DOCKER_CACHE require_job_env USE_DOCKER_CACHE
require_env BUILD_DOCKER_BASE_IMAGE require_job_env BUILD_DOCKER_BASE_IMAGE
require_env BUILD_STREAM stable require_job_env BUILD_STREAM stable
require_env PUSH_DOCKER_IMAGES require_job_env PUSH_DOCKER_IMAGES
declare_env DOCKER_IMAGE_LIST declare_job_env DOCKER_IMAGE_LIST
declare_env DOCKER_BASE_IMAGE declare_job_env DOCKER_BASE_IMAGE
load_build_env load_build_env
require_env DOCKER_BASE_OS require_job_env DOCKER_BASE_OS
require_env DOCKER_OS_LIST require_job_env DOCKER_OS_LIST
wheels_file="std/build-wheels-$DOCKER_BASE_OS-$BUILD_STREAM/stx-$DOCKER_BASE_OS-$BUILD_STREAM-wheels.tar" wheels_file="std/build-wheels-$DOCKER_BASE_OS-$BUILD_STREAM/stx-$DOCKER_BASE_OS-$BUILD_STREAM-wheels.tar"

2
scripts/build-export-dir.sh
View File

@ -11,7 +11,7 @@ source $(dirname "$0")/lib/job_utils.sh
load_build_env load_build_env
declare_env EXTRA_EXPORT_DIR_CMD declare_job_env EXTRA_EXPORT_DIR_CMD
WORKSPACE_EXPORT_DIR="$WORKSPACE_ROOT/export" WORKSPACE_EXPORT_DIR="$WORKSPACE_ROOT/export"

4
scripts/build-helm-charts.sh
View File

@ -9,8 +9,8 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env DRY_RUN require_job_env DRY_RUN
load_build_env load_build_env

4
scripts/build-iso.sh
View File

@ -9,8 +9,8 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env BUILD_ISO require_job_env BUILD_ISO
load_build_env load_build_env

12
scripts/build-packages.sh
View File

@ -8,13 +8,13 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env BUILD_PACKAGES require_job_env BUILD_PACKAGES
declare_env BUILD_PACKAGES_LIST declare_job_env BUILD_PACKAGES_LIST
require_env BUILD_RT require_job_env BUILD_RT
require_env BUILD_ISO require_job_env BUILD_ISO
declare_env BUILD_PACKAGES_PARALLEL_JOBS declare_job_env BUILD_PACKAGES_PARALLEL_JOBS
load_build_env load_build_env

12
scripts/build-wheels.sh
View File

@ -8,12 +8,12 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env USE_DOCKER_CACHE require_job_env USE_DOCKER_CACHE
require_env DRY_RUN require_job_env DRY_RUN
require_env BUILD_STREAM stable require_job_env BUILD_STREAM stable
require_env FORCE_BUILD_WHEELS require_job_env FORCE_BUILD_WHEELS
declare_env DOCKER_IMAGE_LIST declare_job_env DOCKER_IMAGE_LIST
load_build_env load_build_env

16
scripts/clean-build.sh
View File

@ -9,14 +9,14 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env CLEAN_PACKAGES require_job_env CLEAN_PACKAGES
require_env CLEAN_REPOMGR require_job_env CLEAN_REPOMGR
require_env CLEAN_DOWNLOADS require_job_env CLEAN_DOWNLOADS
require_env CLEAN_DOCKER require_job_env CLEAN_DOCKER
require_env CLEAN_ISO require_job_env CLEAN_ISO
require_env IMPORT_BUILD require_job_env IMPORT_BUILD
declare_env IMPORT_BUILD_DIR declare_job_env IMPORT_BUILD_DIR
load_build_env load_build_env

6
scripts/clone-source.sh
View File

@ -10,9 +10,9 @@ set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
source $(dirname "$0")/lib/retries.sh source $(dirname "$0")/lib/retries.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env DRY_RUN require_job_env DRY_RUN
require_env REFRESH_SOURCE require_job_env REFRESH_SOURCE
load_build_env load_build_env

8
scripts/create-changelog.sh
View File

@ -10,10 +10,10 @@ set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
source $(dirname "$0")/lib/changelog_utils.sh source $(dirname "$0")/lib/changelog_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env FORCE_BUILD require_job_env FORCE_BUILD
require_env BUILD_DOCKER_IMAGES_DEV require_job_env BUILD_DOCKER_IMAGES_DEV
require_env BUILD_DOCKER_IMAGES_STABLE require_job_env BUILD_DOCKER_IMAGES_STABLE
load_build_env load_build_env

2
scripts/create-latest-containers-symlinks.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_STATUS require_job_env BUILD_STATUS
load_build_env load_build_env

2
scripts/create-latest-symlinks.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_STATUS require_job_env BUILD_STATUS
load_build_env load_build_env

6
scripts/docker-login.sh
View File

@ -9,9 +9,9 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env PUSH_DOCKER_IMAGES require_job_env PUSH_DOCKER_IMAGES
declare_env DOCKER_CONFIG_FILE declare_job_env DOCKER_CONFIG_FILE
load_build_env load_build_env

2
scripts/download-prerequisites.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_RT require_job_env BUILD_RT
load_build_env load_build_env

2
scripts/init-env.sh
View File

@ -10,7 +10,7 @@ set -e
SCRIPTS_DIR="$(dirname "$0")" SCRIPTS_DIR="$(dirname "$0")"
source "$SCRIPTS_DIR/lib/job_utils.sh" source "$SCRIPTS_DIR/lib/job_utils.sh"
require_env BUILD_HOME require_job_env BUILD_HOME
if [[ -d "$BUILD_HOME" ]] ; then if [[ -d "$BUILD_HOME" ]] ; then
info "creating $BUILD_HOME" info "creating $BUILD_HOME"

38
scripts/lib/job_utils.sh
View File

@ -82,12 +82,12 @@ maybe_run() {
} }
# #
# Usage: declare_env NAME [DFLT] # Usage: declare_job_env NAME [DFLT]
# #
# Make sure the specified env var is defined & non-empty, # Make sure the specified env var is defined & non-empty,
# otherwise it to a default value. # otherwise it to a default value.
# Trim and export it in either case. # Trim and export it in either case.
declare_env() { declare_job_env() {
local var="$1" local var="$1"
local dflt="$2" local dflt="$2"
@ -106,12 +106,12 @@ declare_env() {
} }
# #
# Usage: require_env NAME [DFLT] # Usage: require_job_env NAME [DFLT]
# #
# Same as declare_env, but fail & exit if the var is empty # Same as declare_job_env, but fail & exit if the var is empty
require_env() { require_job_env() {
local var="$1" ; shift || : local var="$1" ; shift || :
declare_env "$var" "$@" declare_job_env "$var" "$@"
[[ -n "${!var}" ]] || die "required variable \"$var\" is not set" [[ -n "${!var}" ]] || die "required variable \"$var\" is not set"
} }
@ -125,10 +125,10 @@ require_file() {
} }
__set_common_vars() { __set_common_vars() {
require_env BUILD_HOME require_job_env BUILD_HOME
require_env TIMESTAMP require_job_env TIMESTAMP
declare_env PUBLISH_TIMESTAMP "$TIMESTAMP" declare_job_env PUBLISH_TIMESTAMP "$TIMESTAMP"
declare_env DRY_RUN declare_job_env DRY_RUN
DOCKER_BASE_OS="debian" DOCKER_BASE_OS="debian"
DOCKER_OS_LIST="debian distroless" DOCKER_OS_LIST="debian distroless"
@ -146,15 +146,15 @@ __set_common_vars() {
__set_build_vars() { __set_build_vars() {
require_env BUILD_USER require_job_env BUILD_USER
require_env PROJECT require_job_env PROJECT
require_env BUILD_HOME require_job_env BUILD_HOME
require_env BUILD_OUTPUT_ROOT require_job_env BUILD_OUTPUT_ROOT
require_env BUILD_OUTPUT_ROOT_URL require_job_env BUILD_OUTPUT_ROOT_URL
require_env TIMESTAMP require_job_env TIMESTAMP
require_env PUBLISH_ROOT require_job_env PUBLISH_ROOT
require_env PUBLISH_ROOT_URL require_job_env PUBLISH_ROOT_URL
require_env PUBLISH_TIMESTAMP require_job_env PUBLISH_TIMESTAMP
# Set a few additional globals # Set a few additional globals
REPO_ROOT_SUBDIR=localdisk/designer/$BUILD_USER/$PROJECT REPO_ROOT_SUBDIR=localdisk/designer/$BUILD_USER/$PROJECT

6
scripts/publish-docker-images.sh
View File

@ -9,9 +9,9 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env BUILD_STREAM require_job_env BUILD_STREAM
require_env TIMESTAMP require_job_env TIMESTAMP
load_build_env load_build_env

2
scripts/publish-logs.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env JENKINS_API_USERPASS require_job_env JENKINS_API_USERPASS
load_build_env load_build_env

4
scripts/publish-packages.sh
View File

@ -11,8 +11,8 @@
source $(dirname "$0")/lib/job_utils.sh || exit 1 source $(dirname "$0")/lib/job_utils.sh || exit 1
source $(dirname "$0")/lib/publish_utils.sh || exit 1 source $(dirname "$0")/lib/publish_utils.sh || exit 1
require_env BUILD_RT || exit 1 require_job_env BUILD_RT || exit 1
require_env BUILD_ISO || exit 1 require_job_env BUILD_ISO || exit 1
load_build_env || exit 1 load_build_env || exit 1

6
scripts/publish-wheels.sh
View File

@ -9,9 +9,9 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env TIMESTAMP require_job_env TIMESTAMP
require_env BUILD_STREAM require_job_env BUILD_STREAM
load_build_env load_build_env

10
scripts/sign-iso.sh
View File

@ -9,16 +9,16 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env BUILD_ISO require_job_env BUILD_ISO
load_build_env load_build_env
require_env SIGN_ISO require_job_env SIGN_ISO
$SIGN_ISO || bail "SIGN_ISO=false, bailing out" $SIGN_ISO || bail "SIGN_ISO=false, bailing out"
require_env SIGNING_SERVER require_job_env SIGNING_SERVER
require_env SIGNING_USER require_job_env SIGNING_USER
$BUILD_ISO || bail "BUILD_ISO=false, bailing out" $BUILD_ISO || bail "BUILD_ISO=false, bailing out"
$SIGN_ISO || bail "SIGN_ISO=false, bailing out" $SIGN_ISO || bail "SIGN_ISO=false, bailing out"

6
scripts/start-containers.sh
View File

@ -9,9 +9,9 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
require_env REBUILD_BUILDER_IMAGES require_job_env REBUILD_BUILDER_IMAGES
require_env USE_DOCKER_CACHE require_job_env USE_DOCKER_CACHE
set -x set -x
load_build_env load_build_env

2
scripts/stop-containers.sh
View File

@ -9,7 +9,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME require_job_env BUILD_HOME
load_build_config load_build_config
if [[ ! -f "$BUILD_HOME/$REPO_ROOT_SUBDIR/stx-tools/import-stx" ]] ; then if [[ ! -f "$BUILD_HOME/$REPO_ROOT_SUBDIR/stx-tools/import-stx" ]] ; then