diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-03-07 01:29:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2019-03-07 01:29:31 +0000 |
| commit | bccd5722e8165d9f7293ffe9d414d28d44f1abf3 (patch) | |
| tree | dc3ad234f54aa1c5ccae18b2159373a675ac1940 /jjb | |
| parent | e10d5dbb08ab2899f4893c697e475aee1891b9bd (diff) | |
| parent | dc85ae0e254679937fa8c8414c3fadbb066356bd (diff) | |
Merge changes I81dfc60f,I56fe3edc,Ic1bf8296,Ifd68eb42,Iddf7394c
* changes:
Use the --version argument
Use the --branch argument
Use the new --build-id argument
Use the new --commit argument
Modify the --build-version content
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/common/include-agl-run-test-short-guppy.sh | 8 | ||||
| -rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh index 42565b4e..29085064 100644 --- a/jjb/common/include-agl-run-test-short-guppy.sh +++ b/jjb/common/include-agl-run-test-short-guppy.sh @@ -20,10 +20,12 @@ CREATE_ARGS+="--build-type release " #[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " #[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -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 " +[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " +[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH " +[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID " +[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH " +[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " CREATE_ARGS+="--callback-from ${LAVA_LAB} " $RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 3a79a2bd..c397f126 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -21,10 +21,12 @@ CREATE_ARGS+="--machine ${releng_device} " CREATE_ARGS+="--build-type ci " [[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="--changeid $GERRIT_CHANGE_NUMBER " [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--patchset $GERRIT_PATCHSET_NUMBER " -BUILD_VERSION="AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER" -[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " -CREATE_ARGS+="--build-version $BUILD_VERSION " +[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " +[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH " +[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID " +[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH " +[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " CREATE_ARGS+="--callback-from ${LAVA_LAB} " if [[ ! -z $lavacli_tags ]] && [[ $MACHINE =~ "-nogfx" ]]; then CREATE_ARGS+="--device-tags ${lavacli_tags} " |