diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 12 | ||||
| -rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 11 | ||||
| -rw-r--r-- | jjb/common/include-agl-source-aglsetup.sh | 16 |
3 files changed, 30 insertions, 9 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 5f37bd1b..c437eefb 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -136,27 +136,27 @@ projects: - name: 'ci-platform-{project}-verify-CIBT-porter-nogfx' current-parameters: true - abort-all-job: true + #abort-all-job: true kill-phase-on: FAILURE - name: 'ci-platform-{project}-verify-CIBT-intel-corei7-64' current-parameters: true - abort-all-job: true + #abort-all-job: true kill-phase-on: FAILURE - name: 'ci-platform-{project}-verify-CIBT-raspberrypi3' current-parameters: true - abort-all-job: true + #abort-all-job: true kill-phase-on: FAILURE - name: 'ci-platform-{project}-verify-CIBT-dra7xx-evm' current-parameters: true - abort-all-job: true + #abort-all-job: true kill-phase-on: FAILURE - name: 'ci-platform-{project}-verify-CIBT-qemux86-64' current-parameters: true - abort-all-job: true + #abort-all-job: true kill-phase-on: FAILURE - name: 'ci-platform-{project}-verify-CIBT-m3ulcb-nogfx' current-parameters: true - abort-all-job: true + #abort-all-job: true kill-phase-on: FAILURE - multijob: name: 'CIBT-{project}-finish-success' diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 3d021675..2e82ade2 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -14,13 +14,18 @@ cd $REPODIR # WIP: use $RELENG for subset of boards __MACHINE=${MACHINE%-nogfx} # releng doesn't care if [ ! -z $RELENG ] && \ - (( x$__MACHINE == x"qemux86-64" || \\ - x$__MACHINE == x"m3ulcb" )); then + [[ x$__MACHINE == x"qemux86-64" || \ + x$__MACHINE == x"m3ulcb" ]]; then CREATE_ARGS="" [[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="-j $GERRIT_CHANGE_NUMBER " [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="-i $GERRIT_PATCHSET_NUMBER " [[ ! -z $TARGETIMAGE ]] && CREATE_ARGS+="--img-name $TARGETIMAGE --img-ext ext4.xz " - CREATE_ARGS+="--test smoke -- " + 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 " + CREATE_ARGS+="--build-version $BUILD_VERSION " + CREATE_ARGS+="--callback lab-baylibre-legacy " + CREATE_ARGS+="--test all -- " $RELENG/utils/create-jobs.py ${CREATE_ARGS} ${__MACHINE} > testjob.yaml cat testjob.yaml else diff --git a/jjb/common/include-agl-source-aglsetup.sh b/jjb/common/include-agl-source-aglsetup.sh index bb76f107..2b010e1b 100644 --- a/jjb/common/include-agl-source-aglsetup.sh +++ b/jjb/common/include-agl-source-aglsetup.sh @@ -15,3 +15,19 @@ ln -sf ../../sstate-cache echo "" >> conf/local.conf echo "### ADDED BY AUTOBUILDER ###" >> conf/local.conf echo "" >> conf/local.conf + +# save some pre-build env needed to uniquely identify the source +MANIFEST_R=repo-manifest-r.txt +repo manifest -r > ${MANIFEST_R} +sha1sum ${MANIFEST_R} | awk '{print $1}' > ${MANIFEST_R}.sha1 + +cat <<EOF > pre-build-env.txt +TARGETBRANCH=${TARGETBRANCH} +TARGETIMAGE=${TARGETIMAGE} +TARGETFEATURES=${TARGETFEATURES} +TARGETMACHINE=${TARGETMACHINE} +TARGETPROJECT=${TARGETPROJECT} +MACHINE=${MACHINE} +GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER} +GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER} +EOF |