From 49327a3679e3fad395fc42cff14691364290d568 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 10 Mar 2021 13:41:08 +0000 Subject: SPEC-3414: generate BUILD_VERSION early We will need to push build info before generating jobs. So first unify build version under an uniq variable name BUILD_VERSION. And generate this early. Bug-AGL: SPEC-3414 Change-Id: Ieba092b2c9d86f9b9feee45a02b553b6cf49fecf Signed-off-by: Corentin LABBE --- jjb/common/include-agl-run-test-short-release.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'jjb/common/include-agl-run-test-short-release.sh') diff --git a/jjb/common/include-agl-run-test-short-release.sh b/jjb/common/include-agl-run-test-short-release.sh index 53011b50..7b13784e 100644 --- a/jjb/common/include-agl-run-test-short-release.sh +++ b/jjb/common/include-agl-run-test-short-release.sh @@ -9,6 +9,9 @@ cd $REPODIR +BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION" +[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" + echo "# LAVA lab target: ${LAVA_LAB} #" # releng-scripts depends on jinja2 >= 2.9 echo "## Check version of python-jinja2: " @@ -18,11 +21,11 @@ CREATE_ARGS+="--machine ${releng_device} " CREATE_ARGS+="--build-type release " [[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " [[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION" -[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION " CREATE_ARGS+="--build-version $BUILD_VERSION " CREATE_ARGS+="--callback-from ${LAVA_LAB} " + +echo "DEBUG: call create-jobs.py with $CREATE_ARGS" $RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml if [ $? != 0 ]; then -- cgit 1.2.3-korg