aboutsummaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/ci-AGL-verify/ci-platform-jjb.yaml31
-rw-r--r--jjb/common/.include-agl-build.sh2
-rw-r--r--jjb/common/include-agl-lava-labs-prepare.sh2
-rw-r--r--jjb/common/include-agl-run-test-short-guppy.sh4
-rw-r--r--jjb/common/include-agl-run-test-short.sh2
-rw-r--r--jjb/common/include-apps-fetch-install-sdk.sh6
-rw-r--r--jjb/daily-jjb-doc-update/include-doc-update.sh4
-rw-r--r--jjb/daily-jjb-doc-update/include-doc-upload.sh5
-rw-r--r--jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh2
9 files changed, 31 insertions, 27 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 9b3ba36f..92fa4339 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -131,14 +131,14 @@
current-parameters: true
#abort-all-job: true
kill-phase-on: FAILURE
- - multijob:
- name: CIB-{project}-verify-failure
- condition: FAILURE
- projects:
- - name: 'ci-platform-{project}-verify-failure'
- current-parameters: true
- #abort-all-job: true
- kill-phase-on: FAILURE
+ #- multijob:
+ # name: CIB-{project}-verify-failure
+ # condition: FAILURE
+ # projects:
+ # - name: 'ci-platform-{project}-verify-failure'
+ # current-parameters: true
+ # #abort-all-job: true
+ # kill-phase-on: FAILURE
# - multijob:
# name: 'CIBT-{project}-start'
# condition: SUCCESSFUL
@@ -179,12 +179,12 @@
current-parameters: true
abort-all-job: true
kill-phase-on: FAILURE
-# publishers:
-# - trigger-parameterized-builds:
-# - project:
-# - ci-platform-{project}-verify-failure
-# condition: FAILED
-# current-parameters: true
+ publishers:
+ - trigger-parameterized-builds:
+ - project:
+ - ci-platform-{project}-verify-failure
+ condition: FAILED
+ current-parameters: true
################################################################################################################################################################
@@ -514,6 +514,9 @@
credential-id: lab_baylibre_seattle_lava_instance
username: LAB_BAYLIBRE_SEATTLE_USER
password: LAB_BAYLIBRE_SEATTLE_TOKEN
+ - text:
+ credential-id: KCI_EMAIL_AUTH_TOKEN
+ variable: KCI_EMAIL_AUTH_TOKEN
builders:
- shell:
!include-raw-escape:
diff --git a/jjb/common/.include-agl-build.sh b/jjb/common/.include-agl-build.sh
index 13ecb938..b1870f2f 100644
--- a/jjb/common/.include-agl-build.sh
+++ b/jjb/common/.include-agl-build.sh
@@ -7,7 +7,7 @@ set -e
# VARIABLES
OPTIND=1
-export DLHOST="https://download.automotivelinux.org/"
+export DLHOST="http://download.automotivelinux.org/"
export NOGFX=false
export VERBOSE=false
export DEBUG=false
diff --git a/jjb/common/include-agl-lava-labs-prepare.sh b/jjb/common/include-agl-lava-labs-prepare.sh
index 70f3be67..f32e16f9 100644
--- a/jjb/common/include-agl-lava-labs-prepare.sh
+++ b/jjb/common/include-agl-lava-labs-prepare.sh
@@ -75,7 +75,7 @@ for lab in "${!labs[@]}"; do
# lavacli: Find the LAVA lab that has the device available to run the job
echo -n "lavacli: Checking for $lava_device at $full_url... "
- lavacli_line=$(lavacli -i $lab devices list | grep $lava_device | head -1)
+ lavacli_line=$(lavacli -i $lab devices list | grep $lava_device | grep Idle,Good | head -1)
lavacli_line=$(echo "$lavacli_line" | tr -d '[:space:]')
if [ -z "$lavacli_line" ]; then
diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh
index 634d9153..c6385219 100644
--- a/jjb/common/include-agl-run-test-short-guppy.sh
+++ b/jjb/common/include-agl-run-test-short-guppy.sh
@@ -7,7 +7,7 @@
set -x
-UPLOAD_URL_BASE=https://download.automotivelinux.org/AGL/upload/ci
+UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
cd $REPODIR
@@ -28,7 +28,7 @@ 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}/ "
-CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION "
+CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
[[ ! -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 "
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 64e6e040..9995e9b5 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -7,7 +7,7 @@
set -x
-UPLOAD_URL_BASE=https://download.automotivelinux.org/AGL/upload/ci
+UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
UPLOAD_URL=${UPLOAD_URL_BASE}/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/${MACHINE}
cd $REPODIR
diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh
index 0cec864d..f1730016 100644
--- a/jjb/common/include-apps-fetch-install-sdk.sh
+++ b/jjb/common/include-apps-fetch-install-sdk.sh
@@ -15,11 +15,11 @@ SDKHOSTDIR="~/agl-sdk"
if test x"" = x"$AGLBRANCH"; then echo "AGLBRANCH not set, quitting" ; exit 1 ; fi
# default to release
-SDKBASEURL="https://download.automotivelinux.org/AGL/release/${AGLBRANCH}/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+SDKBASEURL="http://download.automotivelinux.org/AGL/release/${AGLBRANCH}/latest/${TARGETSDKMACHINE}/deploy/sdk/"
# but master uses snapshot
if test x"master" = x"$AGLBRANCH" ; then
- SDKBASEURL="https://download.automotivelinux.org/AGL/snapshots/master/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+ SDKBASEURL="http://download.automotivelinux.org/AGL/snapshots/master/latest/${TARGETSDKMACHINE}/deploy/sdk/"
fi
# special case for dab
if test x"dab" = x"$AGLBRANCH" ; then
@@ -27,7 +27,7 @@ if test x"dab" = x"$AGLBRANCH" ; then
echo "Skipping dragonboard-410c/aarch64 .... "
exit 0
fi
- SDKBASEURL="https://download.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+ SDKBASEURL="http://download.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/"
fi
diff --git a/jjb/daily-jjb-doc-update/include-doc-update.sh b/jjb/daily-jjb-doc-update/include-doc-update.sh
index 0aec6733..a11cd850 100644
--- a/jjb/daily-jjb-doc-update/include-doc-update.sh
+++ b/jjb/daily-jjb-doc-update/include-doc-update.sh
@@ -11,9 +11,9 @@ git config --global user.name build.automotivelinux.org
git config --global user.email jenkins@automotivelinux.org
rm -rf docs-webtemplate || true
-wget https://raw.githubusercontent.com/automotive-grade-linux/docs-webtemplate/master-next/setupdocs.sh
+wget https://raw.githubusercontent.com/automotive-grade-linux/docs-webtemplate/master/setupdocs.sh
mkdir docs-webtemplate
-bash -x setupdocs.sh --directory=docs-webtemplate --webtemplate-ref=master-next --doctools-ref=master-next --baseurl=/next
+bash -x setupdocs.sh --directory=docs-webtemplate --webtemplate-ref=master --doctools-ref=master
# Todo --baseurl=/upload/ci/20018
cd docs-webtemplate
make build \ No newline at end of file
diff --git a/jjb/daily-jjb-doc-update/include-doc-upload.sh b/jjb/daily-jjb-doc-update/include-doc-upload.sh
index 731a122a..9914e374 100644
--- a/jjb/daily-jjb-doc-update/include-doc-upload.sh
+++ b/jjb/daily-jjb-doc-update/include-doc-upload.sh
@@ -11,10 +11,11 @@ TMPDIR=${TMPDIR:-$WORKSPACE/upload-gh}
ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+rm -rf $TMPDIR || true
mkdir -p $TMPDIR
git clone -b gh-pages git@github.com:automotive-grade-linux/docs-gh-pages.git $TMPDIR/upload-gh-pages
-mkdir -p $TMPDIR/upload-gh-pages/next/
-cp -ar $HTDOCS/* $TMPDIR/upload-gh-pages/next/
+mkdir -p $TMPDIR/upload-gh-pages/
+cp -ar $HTDOCS/* $TMPDIR/upload-gh-pages/
pushd $TMPDIR/upload-gh-pages
git config user.name build.automotivelinux.org
git config user.email jenkins@automotivelinux.org
diff --git a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
index 091aaaa7..ef267a6d 100644
--- a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
+++ b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
@@ -7,7 +7,7 @@ set -e
# VARIABLES
OPTIND=1
-export DLHOST="https://download.automotivelinux.org/"
+export DLHOST="http://download.automotivelinux.org/"
export NOGFX=false
export VERBOSE=false
export DEBUG=false