diff options
Diffstat (limited to 'jjb')
25 files changed, 323 insertions, 153 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 08d76017..92fa4339 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 @@ -26,6 +27,8 @@ - ci-platform-{project}-verify-CIBT-{machine} - ci-platform-{project}-verify-CIBT-finish-success - ci-platform-{project}-remove-artifacts + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" ################################################################################################################################################################ @@ -40,6 +43,8 @@ project-type: multijob concurrent: true node: control-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT @@ -74,10 +79,10 @@ build-timeout: '{build-timeout}' builders: - shell: | - set + set -x export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,') echo \$TRIGGERURL - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true # - multijob: # name: CIB-{project}-start # condition: SUCCESSFUL @@ -90,10 +95,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 +111,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 @@ -122,22 +131,26 @@ current-parameters: true #abort-all-job: true kill-phase-on: FAILURE - # - multijob: - # name: 'CIBT-{project}-start' - # condition: SUCCESSFUL - # projects: - # - name: 'ci-platform-{project}-verify-CIBT-start' - # 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 + # projects: + # - name: 'ci-platform-{project}-verify-CIBT-start' + # current-parameters: true + # abort-all-job: true + # kill-phase-on: FAILURE - multijob: 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 @@ -166,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 ################################################################################################################################################################ @@ -186,6 +199,8 @@ project-type: freestyle concurrent: true node: control-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT @@ -220,8 +235,8 @@ - shell: | #set export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,') - # ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 --label ci-image-build=0 --label ci-image-boot-test=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ ${{BUILD_URL}}" || true - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ \$TRIGGERURL" || true + # ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 --label ci-image-build=0 --label ci-image-boot-test=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ ${{BUILD_URL}}" || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ \$TRIGGERURL" || true ################################################################################ @@ -233,6 +248,8 @@ project-type: freestyle concurrent: true node: agl-test-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT @@ -300,6 +317,8 @@ project-type: freestyle concurrent: true node: control-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT @@ -332,7 +351,7 @@ - shell: | set echo "#### CIB +1 #### Verified +1 ####" - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="CI-Image-Build\ finished,\ CIB+1,\ Verified+1" || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="CI-Image-Build\ finished,\ CIB+1,\ Verified+1" || true ################################################################################ @@ -344,6 +363,8 @@ project-type: freestyle concurrent: true node: control-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT @@ -376,8 +397,8 @@ - shell: | set echo "#### Verified -1 ####" - #ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified -1 -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true + #ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified -1 -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true ################################################################################################################################################################ @@ -392,6 +413,8 @@ project-type: freestyle concurrent: true node: control-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT @@ -426,7 +449,7 @@ - shell: | echo "CIBT Started" # set - # ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-boot-test=0 -n NONE --message='CI-Image-Boot-Test\ started' || true + # ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-boot-test=0 -n NONE --message='CI-Image-Boot-Test\ started' || true ################################################################################ @@ -438,6 +461,8 @@ project-type: freestyle concurrent: true node: hwtest-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT @@ -489,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: @@ -517,6 +545,8 @@ project-type: freestyle concurrent: true node: control-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT @@ -551,7 +581,7 @@ - shell: | # set echo "#### CIBT +1 ####" - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test\ finished' || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test\ finished' || true ################################################################################################################################################################ @@ -566,6 +596,8 @@ project-type: freestyle concurrent: true node: control-slave + description: "Managed by JJB. Do not Edit. \ + <br>Build time graph:<br><img src='buildTimeGraph/png' />" parameters: - string: name: GERRIT_PROJECT diff --git a/jjb/ci-apps-verify/app-projects.yaml.inc b/jjb/ci-apps-verify/app-projects.yaml.inc new file mode 100644 index 00000000..a484ea6a --- /dev/null +++ b/jjb/ci-apps-verify/app-projects.yaml.inc @@ -0,0 +1,74 @@ +- agl-cluster-demo-dashboard +- agl-cluster-demo-receiver +- agl-service-audio-4a +- agl-service-bluetooth +- agl-service-bluetooth-pbap +- agl-service-can-low-level +- agl-service-data-persistence +- agl-service-geoclue +- agl-service-geofence +- agl-service-gps +- agl-service-gstreamer +- agl-service-harvester +- agl-service-helloworld +- agl-service-homescreen +- agl-service-homescreen-2017 +- agl-service-hvac +- agl-service-identity-agent +- agl-service-iiodevices +- agl-service-mediaplayer +- agl-service-mediascanner +- agl-service-navigation +- agl-service-network +- agl-service-nfc +- agl-service-platform-info +- agl-service-radio +- agl-service-signal-composer +- agl-service-soundmanager +- agl-service-soundmanager-2017 +- agl-service-speech +- agl-service-steering-wheel +- agl-service-taskmanager +- agl-service-telephony +- agl-service-unicens +- agl-service-voice-high +- agl-service-voice-high-capabilities +- agl-service-weather +- agl-service-wifi +- agl-service-windowmanager +- agl-service-windowmanager-2017 +- agl-service-xds-monitoring +- als-meter-demo +- app-afb-helpers-submodule +- app-afb-test +- app-controller-submodule +- app-templates +- chromium +- cluster-camera +- cluster-dashboard +- cluster-homescreen +- cluster-hvac +- cluster-launcher +- cluster-qtquickcontrols +- cluster-settings +- cluster-tachometer +- controls +- dashboard +- homescreen +- hvac +- launcher +- low-level-can-service +- mediaplayer +- mixer +- navigation +- onscreenapp +- phone +- radio +- restriction-screen +- settings +- settings-bluetooth +- settings-log-utils +- settings-wifi +- taskmanager +- tbtnavi +- videoplayer diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 710ca366..5fd96ca6 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,61 +17,7 @@ #= dra7xx-evm # ####### REPLACE WITH generic-aarch64, generic-x86-64, generic-arm project: - - 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 - - agl-service-geoclue - - agl-service-geofence - - agl-service-gps - - agl-service-gstreamer - - agl-service-harvester - - agl-service-homescreen - - agl-service-hvac - - agl-service-identity-agent - - agl-service-iiodevices - - agl-service-mediaplayer - - agl-service-mediascanner - - agl-service-navigation - - agl-service-network - - agl-service-nfc - - agl-service-platform-info - - agl-service-radio - - agl-service-signal-composer - - agl-service-soundmanager - - agl-service-speech - - agl-service-steering-wheel - - agl-service-taskmanager - - agl-service-telephony - - agl-service-unicens - - agl-service-voice-high - - agl-service-weather - - agl-service-wifi - - agl-service-windowmanager - - agl-service-windowmanager-2017 - - agl-service-xds-monitoring - - app-afb-test - - chromium - - controls - - dashboard - - homescreen - - hvac - - launcher - - low-level-can-service - - mediaplayer - - mixer - - navigation - - onscreenapp - - phone - - radio - - settings - - settings-bluetooth - - settings-wifi - - taskmanager - - videoplayer + !include: app-projects.yaml.inc jobs: - ci-apps-{project}-verify-{aglbranch} @@ -144,9 +89,10 @@ builders: - shell: | set + set -x export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,') echo \$TRIGGERURL - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true # - multijob: # name: CIB-{project}-start # condition: SUCCESSFUL @@ -314,7 +260,7 @@ - shell: | set echo "#### CIB +1 #### Verified +1 ####" - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="CI-Image-Build\ finished,\ CIB+1,\ Verified+1.\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/upload/ci/${{GERRIT_CHANGE_NUMBER}}/${{GERRIT_PATCHSET_NUMBER}}/\ ." || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="CI-Image-Build\ finished,\ CIB+1,\ Verified+1.\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/upload/ci/${{GERRIT_CHANGE_NUMBER}}/${{GERRIT_PATCHSET_NUMBER}}/\ ." || true publishers: - trigger-parameterized-builds: - project: @@ -367,7 +313,7 @@ - shell: | set echo "#### CIB +1 #### Verified +1 ####" - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-gracetime=+1 --label ci-image-build=+1 -n NONE || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-gracetime=+1 --label ci-image-build=+1 -n NONE || true @@ -415,8 +361,8 @@ - shell: | set echo "#### Verified -1 ####" - #ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified -1 -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true + #ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified -1 -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} -n NONE --message="CI-cycle\ failed.\ URL:\ ${{BUILD_URL}}" || true @@ -666,7 +612,7 @@ build-timeout: '{build-timeout}' builders: - shell: | - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="Merge\ finished,\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/apps/{project}/\ ." || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="Merge\ finished,\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/apps/{project}/\ ." || true @@ -728,8 +674,8 @@ - shell: | #set export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,') - # ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 --label ci-image-build=0 --label ci-image-boot-test=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ ${{BUILD_URL}}" || true - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ \$TRIGGERURL" || true + # ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 --label ci-image-build=0 --label ci-image-boot-test=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ ${{BUILD_URL}}" || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-Image-Build\ started.\ URL:\ \$TRIGGERURL" || true # @@ -848,7 +794,7 @@ - shell: | echo "CIBT Started" # set - # ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-boot-test=0 -n NONE --message='CI-Image-Boot-Test\ started' || true + # ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --label ci-image-boot-test=0 -n NONE --message='CI-Image-Boot-Test\ started' || true # @@ -898,7 +844,7 @@ - shell: | # set echo "#### CIBT +1 ####" - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test\ finished' || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test\ finished' || true diff --git a/jjb/ci-apps-verify/update-app-projects-yaml.sh b/jjb/ci-apps-verify/update-app-projects-yaml.sh new file mode 100755 index 00000000..8a645b9c --- /dev/null +++ b/jjb/ci-apps-verify/update-app-projects-yaml.sh @@ -0,0 +1,2 @@ +#!/bin/bash +agl-gerrit-lsprojects-apps | sed -e "s'apps/'- 'g" > app-projects.yaml.inc 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/ci-management/include-raw-jjb-update.sh b/jjb/ci-management/include-raw-jjb-update.sh index de2ec5ef..0a87bac6 100644 --- a/jjb/ci-management/include-raw-jjb-update.sh +++ b/jjb/ci-management/include-raw-jjb-update.sh @@ -6,5 +6,5 @@ function submitJJB { git push origin HEAD:refs/for/master } -gitdir=$(git rev-parse --git-dir); scp -p -P 29418 agl-jobbuilder@gerrit.automotivelinux.org:hooks/commit-msg ${gitdir}/hooks/ +gitdir=$(git rev-parse --git-dir); scp -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p -P 29418 agl-jobbuilder@gerrit.automotivelinux.org:hooks/commit-msg ${gitdir}/hooks/ git diff --exit-code || submitJJB diff --git a/jjb/ci-xds-verify/ci-xds-jjb.yaml b/jjb/ci-xds-verify/ci-xds-jjb.yaml index 497e665e..7cebdfae 100644 --- a/jjb/ci-xds-verify/ci-xds-jjb.yaml +++ b/jjb/ci-xds-verify/ci-xds-jjb.yaml @@ -72,7 +72,7 @@ set export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,') echo \$TRIGGERURL - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true - multijob: name: CIB-{project} condition: SUCCESSFUL @@ -203,7 +203,7 @@ - shell: | set echo "#### CIB +1 #### Verified +1 ####" - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="CI-Image-Build\ finished,\ CIB+1,\ Verified+1.\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/upload/ci/${{GERRIT_CHANGE_NUMBER}}/${{GERRIT_PATCHSET_NUMBER}}/\ ." || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="CI-Image-Build\ finished,\ CIB+1,\ Verified+1.\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/upload/ci/${{GERRIT_CHANGE_NUMBER}}/${{GERRIT_PATCHSET_NUMBER}}/\ ." || true # - ci-xds-{project}-verify-{aglbranch}-failure @@ -391,7 +391,7 @@ build-timeout: '{build-timeout}' builders: - shell: | - ssh -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="Merge\ finished,\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/xds/{project}/\ ." || true + ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="Merge\ finished,\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/xds/{project}/\ ." || true # - ci-xds-{project}-remove-artifacts 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-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh index 8811d3fd..e5ad5c8e 100644 --- a/jjb/common/include-agl-auto-conf.sh +++ b/jjb/common/include-agl-auto-conf.sh @@ -11,10 +11,6 @@ if test x"" = x"${GERRIT_BRANCH}"; then else export DISTROBRANCH="${GERRIT_BRANCH}" fi -#if test ! x"" = x"${RELEASE_BRANCH}"; then -# export DISTROBRANCH="$RELEASE_BRANCH" -#fi -#limit parallel number of bitbake jobs and parallel jobs in make cat << EOF >> conf/auto.conf PREMIRRORS = "\ git://.*/.* ${DLHOST}/AGL/mirror/ \n \ @@ -23,6 +19,11 @@ http://.*/.* ${DLHOST}/AGL/mirror/ \n \ https://.*/.* ${DLHOST}/AGL/mirror/ \n \ " +EOF + +if test x"YES" != x"${DISABLE_SSTATE_MIRROR}" ; then + +cat << EOF >> conf/auto.conf SSTATE_MIRRORS = " \ file://.* ${DLHOST}/sstate-mirror/${DISTROBRANCH}/\${DEFAULTTUNE}/PATH \n \ " @@ -33,3 +34,5 @@ SSTATE_MIRRORS = " \ IMAGE_FSTYPES_remove = "ext3" SSTATE_DIR = "\${TOPDIR}/sstate-cache/\${MACHINE}/" EOF + +fi
\ No newline at end of file diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh index 3ecb0d12..22dc0c3b 100644 --- a/jjb/common/include-agl-lava-jobs-submit.sh +++ b/jjb/common/include-agl-lava-jobs-submit.sh @@ -53,6 +53,23 @@ echo "####" echo "#### End: Output from LAVA job $job_id ####" echo "####" +# ask for email report + +if [ -z "$KCI_EMAIL_AUTH_TOKEN" ]; then + KCI_API='https://kernelci.dev.baylibre.com:8081' + TREE_NAME=$(grep kernel.tree: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2) + BRANCH=$(grep git.branch: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2) + GIT_DESCRIBE="$(grep kernel.version: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2)" + lavacli --uri $LAVA_MASTER_URI results $job_id | grep '* [0-9]' |cut -d_ -f2- |cut -d. -f1 | sort | uniq > test_plans + if [ $? -eq 0 ] && [ -s test_plans ]; then + for plan in $(<test_plans); do + curl -X POST -H "Authorization: $KCI_EMAIL_AUTH_TOKEN" -H "Content-Type: application/json" -d '{"job": "'$TREE_NAME'", "kernel": "'$GIT_DESCRIBE'", "git_branch": "'$BRANCH'", "report_type": "test", "plan": "'$plan'", "send_to": [" automotive-testreports@lists.linuxfoundation.org"], "format": ["txt"], "delay": 3600}' ${KCI_API}/send + echo "The test email reportS will be sent with a delay of 1 hour " + done + else + echo "There is no test plan identified" + fi +fi # after one successful submit, we're done if [ x"$status" = x"Complete" ]; then exit 0 diff --git a/jjb/common/include-agl-lava-labs-prepare.sh b/jjb/common/include-agl-lava-labs-prepare.sh index ea025469..f32e16f9 100644 --- a/jjb/common/include-agl-lava-labs-prepare.sh +++ b/jjb/common/include-agl-lava-labs-prepare.sh @@ -69,6 +69,33 @@ for lab in "${!labs[@]}"; do fi rm -f $token_file + # lavacli auth using token + mkdir -p ~/.config + lavacli identities add --token ${token} --uri ${url}/RPC2 --username $user $lab + + # 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 | grep Idle,Good | head -1) + lavacli_line=$(echo "$lavacli_line" | tr -d '[:space:]') + + if [ -z "$lavacli_line" ]; then + echo "not found." + fi + IFS=':' + arr=($lavacli_line) + device_status=${arr[1]} + IFS=${OFS} + + if [ x"$device_status" = x"Idle,Good" ]; then + echo "lavacli: found a device available: $lavacli_line" + lavacli_dev=$(echo ${arr[0]} | sed 's/\*\([^(]*\).*/\1/') + lavacli_tags=$(lavacli -i $lab devices tags list $lavacli_dev | grep \*) + lavacli_tags=$(echo $lavacli_tags | sed 's/\* \(\)/\1/') + echo "Tags for $lavacli_dev: $lavacli_tags" + else + echo "lavacli: did not find any device available: $lavacli_line" + fi + # Find the LAVA Lab that has the device available to run the job echo -n "Checking for $lava_device at $full_url... " line=$(lava-tool devices-list $full_url | grep $lava_device) diff --git a/jjb/common/include-agl-run-test-rsync-changeid.sh b/jjb/common/include-agl-run-test-rsync-changeid.sh index 4b8b8eac..0d37641b 100644 --- a/jjb/common/include-agl-run-test-rsync-changeid.sh +++ b/jjb/common/include-agl-run-test-rsync-changeid.sh @@ -28,14 +28,26 @@ cd output pwd ls -alhR tmp/deploy/images +set -x + +echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB}" +echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-}" + +# workaround for thud until fixed in templates: +if [ ! -e tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB} -a -e tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} ] ; then + cp -avL tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB} +fi + +BUILD_INFO=build-info # copy files to $DEST (only if variable is non-empty) -for i in DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT; do +for i in DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT BUILD_INFO; do FILE=$(eval echo \$${i}) if [ -n "$FILE" ]; then cp -avL tmp/deploy/images/${TARGETMACHINE}/${FILE} ${DEST}/ cp -avL tmp/deploy/images/${TARGETMACHINE}/${FILE} ${DEST2}/ fi done +set +x tree $DEST ls -alhR $DEST diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh index ff1fd750..c6385219 100644 --- a/jjb/common/include-agl-run-test-short-guppy.sh +++ b/jjb/common/include-agl-run-test-short-guppy.sh @@ -7,8 +7,17 @@ set -x +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 +wget -q ${UPLOAD_URL}/build-info +if [ -e build-info ]; then + cat build-info + source build-info +fi + echo "# LAVA lab target: ${LAVA_LAB} #" # releng-scripts depends on jinja2 >= 2.9 echo "## Check version of python-jinja2: " @@ -19,10 +28,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 " +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 " +[[ ! -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 903d9532..9995e9b5 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -7,8 +7,17 @@ set -x +UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci +UPLOAD_URL=${UPLOAD_URL_BASE}/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/${MACHINE} + cd $REPODIR +wget -q ${UPLOAD_URL}/build-info +if [ -e build-info ]; then + cat build-info + source build-info +fi + echo "# LAVA lab target: ${LAVA_LAB} #" # releng-scripts depends on jinja2 >= 2.9 echo "## Check version of python-jinja2: " @@ -18,11 +27,18 @@ 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} " +else + CREATE_ARGS+="--device-tags ${lavacli_tags} "weston" " +fi $RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml if [ $? != 0 ]; then diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh index 0cec864d..49fb27b6 100644 --- a/jjb/common/include-apps-fetch-install-sdk.sh +++ b/jjb/common/include-apps-fetch-install-sdk.sh @@ -4,6 +4,7 @@ # # debugging purposes set -e +set -x SDKHOSTDIR="~/agl-sdk" @@ -15,11 +16,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 +28,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/common/include-apps-header.sh b/jjb/common/include-apps-header.sh index 9afcbde6..e04ec86e 100644 --- a/jjb/common/include-apps-header.sh +++ b/jjb/common/include-apps-header.sh @@ -103,7 +103,7 @@ fi case "$TARGETARCH" in arm) - export TARGETSDKARCH="armv7vehf-neon-vfpv4" + export TARGETSDKARCH="armv7ve.*hf-neon-vfpv4" export TARGETSDKMACHINE="raspberrypi3" ;; x86-64) 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/daily-jjb-doc-update/daily-jjb-doc-update.yaml b/jjb/daily-jjb-doc-update/daily-jjb-doc-update.yaml index 55186891..e95ce9f4 100644 --- a/jjb/daily-jjb-doc-update/daily-jjb-doc-update.yaml +++ b/jjb/daily-jjb-doc-update/daily-jjb-doc-update.yaml @@ -24,6 +24,9 @@ wrappers: - agl-infra-wrappers: build-timeout: '{build-timeout}' + - ssh-agent-credentials: + users: + - 'jenkins-github-agldocs' builders: - shell: diff --git a/jjb/daily-jjb-doc-update/include-doc-update.sh b/jjb/daily-jjb-doc-update/include-doc-update.sh index 47570151..a11cd850 100644 --- a/jjb/daily-jjb-doc-update/include-doc-update.sh +++ b/jjb/daily-jjb-doc-update/include-doc-update.sh @@ -1,25 +1,19 @@ #!/bin/bash set -e +#!/bin/bash +set -e +set -x # we need a name and an email #git config --global user.name build.automotivelinux.org #git config --global user.email jenkins@automotivelinux.org -git config user.name build.automotivelinux.org -git config user.email jenkins@automotivelinux.org - -# make sure 'node' is in path (debian calls it nodejs) -mkdir -p bin -ln -sf /usr/bin/nodejs bin/node -export PATH=$PATH:`pwd`/bin - -pushd doctools/webdocs - npm install - gem list -popd +git config --global user.name build.automotivelinux.org +git config --global user.email jenkins@automotivelinux.org -# build the docs -pushd webdocs-agl - make clean - make fetch - make build -popd
\ No newline at end of file +rm -rf docs-webtemplate || true +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 --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 116f703f..9914e374 100644 --- a/jjb/daily-jjb-doc-update/include-doc-upload.sh +++ b/jjb/daily-jjb-doc-update/include-doc-upload.sh @@ -1,16 +1,26 @@ #!/bin/bash +set -e +set -x + +[[ -z "$WORKSPACE" ]] && WORKSPACE=$(pwd -P) +HTDOCS=${HTDOCS:-$WORKSPACE/docs-webtemplate/build-dev/} +TMPDIR=${TMPDIR:-$WORKSPACE/upload-gh} + # publish the docs -pushd webdocs-agl - git clone -b gh-pages git@github.com:automotive-grade-linux/docs-agl.git upload-gh-pages - cp -ar build-dev/* upload-gh-pages/ - pushd upload-gh-pages + +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/ +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 git diff git add . git commit --amend -m"Render: $(date)" git push origin gh-pages:gh-pages -f - popd -popd - +popd
\ No newline at end of file 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: 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 diff --git a/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml b/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml index e16ac4d4..68267dc6 100644 --- a/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml +++ b/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml @@ -35,6 +35,14 @@ name: UPLOAD default: yes_or_no description: "Upload?" + - string: + name: BUILDONLY + default: ignore + description: "build only specified machine" + - string: + name: DISABLE_SSTATE_MIRROR + default: ignore + description: "Set to YES to disable sstate-mirror" axes: - axis: type: user-defined diff --git a/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml b/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml index 98e46584..0a42908a 100644 --- a/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml +++ b/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml @@ -39,6 +39,10 @@ name: BUILDONLY default: ignore description: "build only specified machine" + - string: + name: DISABLE_SSTATE_MIRROR + default: ignore + description: "Set to YES to disable sstate-mirror" axes: - axis: type: user-defined diff --git a/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml b/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml index 5686fb54..6f6d54e5 100644 --- a/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml +++ b/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml @@ -39,6 +39,10 @@ name: BUILDONLY default: ignore description: "build only specified machine" + - string: + name: DISABLE_SSTATE_MIRROR + default: ignore + description: "Set to YES to disable sstate-mirror" axes: - axis: type: user-defined @@ -68,7 +72,7 @@ triggers: - gerrit-trigger-patch-submitted-silent: name: 'AGL/AGL-repo' - branch: 'tags/guppy/**' + branch: 'regs/tags/guppy/**' wrappers: - agl-infra-wrappers: |