diff options
| -rw-r--r-- | jjb/ci-apps-verify/ci-apps-jjb.yaml | 10 | ||||
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 6 | ||||
| -rw-r--r-- | jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 8f2444e9..8a7bbb22 100644 --- a/jjb/ci-apps-verify/ci-apps-jjb.yaml +++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml @@ -3,9 +3,8 @@ name: ci-apps-AGL aglbranch: - master + - guppy - flounder - - eel - - dab architecture: - aarch64 #= dragonboard-410c (disabled for dab atm) @@ -18,10 +17,10 @@ #= dra7xx-evm # ####### REPLACE WITH generic-aarch64, generic-x86-64, generic-arm project: + - agl-cluster-demo-dashboard + - agl-cluster-demo-receiver - agl-service-audio-4a - - agl-service-audio-mpcd - agl-service-bluetooth - - agl-service-bluetooth-avrcp - agl-service-bluetooth-pbap - agl-service-can-low-level - agl-service-data-persistence @@ -30,6 +29,7 @@ - agl-service-gps - agl-service-gstreamer - agl-service-harvester + - agl-service-helloworld - agl-service-homescreen - agl-service-hvac - agl-service-identity-agent @@ -52,8 +52,8 @@ - agl-service-weather - agl-service-wifi - agl-service-windowmanager - - agl-service-windowmanager-2017 - agl-service-xds-monitoring + - als-meter-demo - app-afb-test - chromium - controls diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 75ab030f..32bae21c 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -77,7 +77,7 @@ wrappers: - agl-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: '180' triggers: - gerrit-trigger-patch-merged: @@ -115,7 +115,7 @@ wrappers: - timeout: type: absolute - timeout: '{build-timeout}' + timeout: '180' timeout-var: 'BUILD_TIMEOUT' fail: true - ssh-agent-credentials: @@ -164,7 +164,7 @@ wrappers: - timeout: type: absolute - timeout: '{build-timeout}' + timeout: '180' timeout-var: 'BUILD_TIMEOUT' fail: true - ssh-agent-credentials: diff --git a/jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh b/jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh index a9ee20a9..9d1ad98f 100644 --- a/jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh +++ b/jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh @@ -48,6 +48,10 @@ function gensite() { navbarColor="darkslategray" typeDocStr="Flounder release" fi + if [ "$branch" == "guppy" ] ; then + navbarColor="#054458" + typeDocStr="Guppy release" + fi git apply <<EOF diff --git a/site/_includes/header.html b/site/_includes/header.html @@ -90,6 +94,7 @@ EOF gensite master gensite flounder +gensite guppy # front page echo "Generating front page in $HTDOCS/index.html" @@ -172,6 +177,7 @@ cat <<EOF >$HTDOCS/index.html <div class="hero_buttons"> <a href="/master" class="col-xs-12 col-sm-5 btn btn-lg btn-primary" style="margin: auto;">Master (Development)</a> <a href="/flounder" class="col-xs-12 col-sm-5 btn btn-lg btn-primary">Flounder (AGL 6.x)</a> + <a href="/guppy" class="col-xs-12 col-sm-5 btn btn-lg btn-primary">Guppy (AGL 7.x)</a> </div> </div> </div> |