diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 19 | ||||
| -rw-r--r-- | jjb/ci-apps-verify/ci-apps-jjb.yaml | 10 | ||||
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 8 | ||||
| -rw-r--r-- | jjb/daily-jjb-doc-multiversion-update/include-doc-multiversion-update.sh | 6 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 4 |
5 files changed, 27 insertions, 20 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 08d76017..058a508b 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -2,12 +2,13 @@ - project: name: ci-platform-AGL machine: - - cyclone5 - raspberrypi3 - intel-corei7-64 - dra7xx-evm - m3ulcb-nogfx - qemux86-64 + - qemuarm + - qemuarm64 project: - meta-agl - meta-agl-demo @@ -90,10 +91,6 @@ name: CIB-{project} condition: SUCCESSFUL projects: - - name: 'ci-platform-{project}-verify-CIB-porter-nogfx' - current-parameters: true - #abort-all-job: true - kill-phase-on: FAILURE - name: 'ci-platform-{project}-verify-CIB-intel-corei7-64' current-parameters: true #abort-all-job: true @@ -110,6 +107,14 @@ current-parameters: true #abort-all-job: true kill-phase-on: FAILURE + - name: 'ci-platform-{project}-verify-CIB-qemuarm' + current-parameters: true + #abort-all-job: true + kill-phase-on: FAILURE + - name: 'ci-platform-{project}-verify-CIB-qemuarm64' + current-parameters: true + #abort-all-job: true + kill-phase-on: FAILURE - name: 'ci-platform-{project}-verify-CIB-m3ulcb-nogfx' current-parameters: true #abort-all-job: true @@ -134,10 +139,6 @@ name: CIBT-{project} condition: SUCCESSFUL projects: - - name: 'ci-platform-{project}-verify-CIBT-porter-nogfx' - current-parameters: 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 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..203effb4 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -39,7 +39,7 @@ wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8' triggers: - gerrit-trigger-patch-submitted: @@ -76,7 +76,7 @@ choosing-strategy: 'default' wrappers: - - agl-infra-wrappers: + - agl-infra-wrappers: build-timeout: '{build-timeout}' triggers: @@ -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> diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 6efbdac1..0a93a6bd 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -273,7 +273,7 @@ trigger-on: - change-abandoned-event - comment-added-contains-event: - comment-contains-value: 'remove-artifacts$' + comment-contains-value: 'remove-the-artifacts$' projects: - project-compare-type: 'ANT' project-pattern: '{name}' @@ -346,7 +346,7 @@ - change-merged-event - change-abandoned-event - comment-added-contains-event: - comment-contains-value: 'remove-artifacts$' + comment-contains-value: 'remove-the-artifacts$' - comment-added-contains-event: comment-contains-value: 'remerge$' projects: |