diff options
| -rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 141 | ||||
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 12 | ||||
| -rw-r--r-- | jjb/pre-fetch/pre-fetch.yaml | 8 | ||||
| -rw-r--r-- | jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml | 8 | ||||
| -rw-r--r-- | jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml | 8 | ||||
| -rw-r--r-- | jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml | 44 | ||||
| -rw-r--r-- | jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml | 8 | ||||
| -rw-r--r-- | jjb/snapshot-jjb-container/snapshot-jjb-container.yaml | 8 | ||||
| -rw-r--r-- | jjb/test-lava/test-lava.yaml | 36 |
9 files changed, 136 insertions, 137 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 5f95948e..ee287f52 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -1,31 +1,32 @@ +--- - project: name: ci-platform-AGL machine: - - porter-nogfx - - raspberrypi3 - - intel-corei7-64 - - dra7xx-evm - - qemux86-64 + - porter-nogfx + - raspberrypi3 + - intel-corei7-64 + - dra7xx-evm + - qemux86-64 project: - - meta-agl - - meta-agl-demo - - meta-agl-devel - - meta-agl-extra - - AGL-repo - - meta-renesas + - meta-agl + - meta-agl-demo + - meta-agl-devel + - meta-agl-extra + - AGL-repo + - meta-renesas jobs: - - ci-platform-{project}-verify -# - ci-platform-{project}-verify-CIB-start - - ci-platform-{project}-verify-CIB-{machine} - - ci-platform-{project}-verify-CIB-finish-success - - ci-platform-{project}-verify-failure -# - ci-platform-{project}-verify-CIBT-start - - ci-platform-{project}-verify-CIBT-{machine} - - ci-platform-{project}-verify-CIBT-finish-success + - ci-platform-{project}-verify + # - ci-platform-{project}-verify-CIB-start + - ci-platform-{project}-verify-CIB-{machine} + - ci-platform-{project}-verify-CIB-finish-success + - ci-platform-{project}-verify-failure + # - ci-platform-{project}-verify-CIBT-start + - ci-platform-{project}-verify-CIBT-{machine} + - ci-platform-{project}-verify-CIBT-finish-success # # -verify = trigger from gerrit and control job -################################################ +# ############################################### - job-template: name: 'ci-platform-{project}-verify' @@ -61,8 +62,8 @@ triggers: - gerrit-trigger-patch-submitted-manual-verified: - name: 'AGL/{project}' - branch: '**/**/**' + name: 'AGL/{project}' + branch: '**/**/**' wrappers: - agl-infra-wrappers: @@ -71,16 +72,16 @@ builders: - shell: | set - #export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,') + # 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-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true -# - multijob: -# name: CIB-{project}-start -# condition: SUCCESSFUL -# projects: -# - name: 'ci-platform-{project}-verify-CIB-start' -# current-parameters: true -# abort-all-job: true -# kill-phase-on: FAILURE + # - multijob: + # name: CIB-{project}-start + # condition: SUCCESSFUL + # projects: + # - name: 'ci-platform-{project}-verify-CIB-start' + # current-parameters: true + # abort-all-job: true + # kill-phase-on: FAILURE - multijob: name: CIB-{project} condition: SUCCESSFUL @@ -113,14 +114,14 @@ 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}-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 @@ -163,7 +164,7 @@ # # -verify-failure -#################### +# ################### - job-template: name: 'ci-platform-{project}-verify-failure' @@ -211,7 +212,7 @@ # # CIB-{machine} -############### +# ############## - job-template: name: 'ci-platform-{project}-verify-CIB-{machine}' @@ -258,18 +259,18 @@ builders: - shell: - !include-raw-escape: - - ../common/include-agl-header.sh - - ../common/include-agl-repo.sh - - ../common/include-agl-select.sh - - ../common/include-agl-source-aglsetup.sh - - ../common/include-agl-auto-conf.sh - - ../common/include-agl-limit-parallelism.sh - - ../common/include-agl-local-conf-fstypes.sh - - ../common/include-agl-cat-auto-conf.sh - - ../common/include-agl-bitbake-image.sh - - ../common/include-agl-run-test-prepare.sh - - ../common/include-agl-run-test-rsync-changeid.sh + !include-raw-escape: + - ../common/include-agl-header.sh + - ../common/include-agl-repo.sh + - ../common/include-agl-select.sh + - ../common/include-agl-source-aglsetup.sh + - ../common/include-agl-auto-conf.sh + - ../common/include-agl-limit-parallelism.sh + - ../common/include-agl-local-conf-fstypes.sh + - ../common/include-agl-cat-auto-conf.sh + - ../common/include-agl-bitbake-image.sh + - ../common/include-agl-run-test-prepare.sh + - ../common/include-agl-run-test-rsync-changeid.sh publishers: - naginator: rerun-unstable-builds: true @@ -281,7 +282,7 @@ # # CIB-start -############ +# ########### - job-template: name: 'ci-platform-{project}-verify-CIB-start' @@ -325,12 +326,12 @@ builders: - 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 + # 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 # # CIB-finish-success -#################### +# ################### - job-template: name: 'ci-platform-{project}-verify-CIB-finish-success' @@ -375,11 +376,9 @@ 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 - - # # CIBT-{machine} 'BOOT TEST' -############################ +# ########################### - job-template: name: 'ci-platform-{project}-verify-CIBT-{machine}' @@ -431,12 +430,12 @@ builders: - shell: - !include-raw-escape: - - ../common/include-agl-header.sh - - ../common/include-agl-repo.sh - - ../common/include-agl-select.sh - - ../common/include-agl-run-test-prepare.sh - - ../common/include-agl-run-test-short.sh + !include-raw-escape: + - ../common/include-agl-header.sh + - ../common/include-agl-repo.sh + - ../common/include-agl-select.sh + - ../common/include-agl-run-test-prepare.sh + - ../common/include-agl-run-test-short.sh publishers: - naginator: @@ -449,7 +448,7 @@ # # CIBT-start -################ +# ############### - job-template: name: 'ci-platform-{project}-verify-CIBT-start' @@ -493,13 +492,13 @@ builders: - 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 + # 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 # # CIBT-finish-success -##################### +# #################### - job-template: name: 'ci-platform-{project}-verify-CIBT-finish-success' @@ -542,6 +541,6 @@ builders: - shell: | - #set + # 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 diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index ceb8df83..a519b75f 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -29,12 +29,12 @@ wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - '{ssh-credentials}' triggers: - - gerrit-trigger-patch-submitted: - name: '{project}' - branch: '{branch}' + - gerrit-trigger-patch-submitted: + name: '{project}' + branch: '{branch}' builders: - shell: | @@ -70,8 +70,8 @@ triggers: - gerrit-trigger-patch-merged: - name: '{project}' - branch: '{branch}' + name: '{project}' + branch: '{branch}' builders: - shell: diff --git a/jjb/pre-fetch/pre-fetch.yaml b/jjb/pre-fetch/pre-fetch.yaml index a73a947b..183f7c79 100644 --- a/jjb/pre-fetch/pre-fetch.yaml +++ b/jjb/pre-fetch/pre-fetch.yaml @@ -1,7 +1,8 @@ +--- - project: name: pre-fetch-mirror jobs: - - pre-fetch-mirror-weekly + - pre-fetch-mirror-weekly - job-template: name: 'pre-fetch-mirror-weekly' @@ -24,7 +25,6 @@ builders: - shell: - !include-raw-escape: include-prefetch.sh + !include-raw-escape: include-prefetch.sh - shell: - !include-raw-escape: include-rsync-prefetch.sh - + !include-raw-escape: include-rsync-prefetch.sh diff --git a/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml b/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml index f0b93126..4e9a4f4b 100644 --- a/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml +++ b/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml @@ -1,7 +1,8 @@ +--- - project: name: release-jjb-blowfish-snapshot jobs: - - release-jjb-blowfish-snapshot + - release-jjb-blowfish-snapshot - job-template: name: 'release-jjb-blowfish-snapshot' @@ -52,7 +53,6 @@ builders: - shell: - !include-raw-escape: include-release-jjb-blowfish-snapshot-build.sh + !include-raw-escape: include-release-jjb-blowfish-snapshot-build.sh - shell: - !include-raw-escape: include-release-jjb-blowfish-snapshot-rsync.sh - + !include-raw-escape: include-release-jjb-blowfish-snapshot-rsync.sh diff --git a/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml b/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml index 7473f5d4..efb95ead 100644 --- a/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml +++ b/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml @@ -1,7 +1,8 @@ +--- - project: name: release-jjb-chinook-release-from-snapshot jobs: - - release-jjb-chinook-release-from-snapshot + - release-jjb-chinook-release-from-snapshot - job-template: name: 'release-jjb-chinook-release-from-snapshot' @@ -47,6 +48,5 @@ builders: - shell: - !include-raw-escape: - - include-release-jjb-chinook-release-move-sandbox.sh - + !include-raw-escape: + - include-release-jjb-chinook-release-move-sandbox.sh diff --git a/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml b/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml index 262da665..eb6ad1d0 100644 --- a/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml +++ b/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml @@ -1,7 +1,8 @@ +--- - project: name: release-jjb-chinook-snapshot jobs: - - release-jjb-chinook-snapshot + - release-jjb-chinook-snapshot - job-template: name: 'release-jjb-chinook-snapshot' @@ -58,8 +59,8 @@ triggers: - gerrit-trigger-patch-submitted-silent: - name: 'AGL/AGL-repo' - branch: 'refs/tags/chinook/**' + name: 'AGL/AGL-repo' + branch: 'refs/tags/chinook/**' wrappers: - agl-infra-wrappers: @@ -67,23 +68,22 @@ builders: - shell: - !include-raw-escape: - - ../common/include-agl-header.sh - - ../common/include-agl-repo.sh - - ../common/include-agl-select.sh - - ../common/include-agl-source-aglsetup.sh - - ../common/include-agl-auto-conf.sh - - ../common/include-agl-limit-parallelism.sh - - ../common/include-agl-cat-auto-conf.sh - - ../common/include-agl-local-conf-archiver.sh - - ../common/include-agl-local-conf-isafw.sh - - ../common/include-agl-local-conf-fstypes.sh - - ../common/include-agl-local-conf-vmdk.sh - - ../common/include-agl-bitbake-image.sh - - ../common/include-agl-bitbake-sdk.sh - - ../common/include-agl-run-test-prepare.sh - - ../common/include-agl-run-test-rsync-release.sh - - ../common/include-agl-run-test-short-release.sh + !include-raw-escape: + - ../common/include-agl-header.sh + - ../common/include-agl-repo.sh + - ../common/include-agl-select.sh + - ../common/include-agl-source-aglsetup.sh + - ../common/include-agl-auto-conf.sh + - ../common/include-agl-limit-parallelism.sh + - ../common/include-agl-cat-auto-conf.sh + - ../common/include-agl-local-conf-archiver.sh + - ../common/include-agl-local-conf-isafw.sh + - ../common/include-agl-local-conf-fstypes.sh + - ../common/include-agl-local-conf-vmdk.sh + - ../common/include-agl-bitbake-image.sh + - ../common/include-agl-bitbake-sdk.sh + - ../common/include-agl-run-test-prepare.sh + - ../common/include-agl-run-test-rsync-release.sh + - ../common/include-agl-run-test-short-release.sh - shell: - !include-raw-escape: include-release-jjb-chinook-snapshot-rsync.sh - + !include-raw-escape: include-release-jjb-chinook-snapshot-rsync.sh diff --git a/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml b/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml index f9c5353c..f532c58d 100644 --- a/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml +++ b/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml @@ -1,7 +1,8 @@ +--- - project: name: release-jjb-chinook-sources jobs: - - release-jjb-chinook-sources + - release-jjb-chinook-sources - job-template: name: 'release-jjb-chinook-sources' @@ -35,6 +36,5 @@ builders: - shell: - !include-raw-escape: - - include-release-jjb-chinook-release-sources-rsync.sh - + !include-raw-escape: + - include-release-jjb-chinook-release-sources-rsync.sh diff --git a/jjb/snapshot-jjb-container/snapshot-jjb-container.yaml b/jjb/snapshot-jjb-container/snapshot-jjb-container.yaml index 2490fcc3..a733c09d 100644 --- a/jjb/snapshot-jjb-container/snapshot-jjb-container.yaml +++ b/jjb/snapshot-jjb-container/snapshot-jjb-container.yaml @@ -1,7 +1,8 @@ +--- - project: name: snapshot-jjb-container jobs: - - snapshot-jjb-container-weekly + - snapshot-jjb-container-weekly - job-template: name: 'snapshot-jjb-container-weekly' @@ -24,7 +25,6 @@ builders: - shell: - !include-raw-escape: include-createcontainer.sh + !include-raw-escape: include-createcontainer.sh - shell: - !include-raw-escape: include-rsync-container.sh - + !include-raw-escape: include-rsync-container.sh diff --git a/jjb/test-lava/test-lava.yaml b/jjb/test-lava/test-lava.yaml index e30a8962..4f0a20c0 100644 --- a/jjb/test-lava/test-lava.yaml +++ b/jjb/test-lava/test-lava.yaml @@ -1,7 +1,8 @@ +--- - project: name: test-lava jobs: - - test-lava + - test-lava - job-template: name: 'test-lava' @@ -48,10 +49,10 @@ artifact-days-to-keep: -1 artifact-num-to-keep: 5 -# triggers: -# - gerrit-trigger-patch-submitted-silent: -# name: 'AGL/AGL-repo' -# branch: 'refs/tags/chinook/**' + # triggers: + # - gerrit-trigger-patch-submitted-silent: + # name: 'AGL/AGL-repo' + # branch: 'refs/tags/chinook/**' wrappers: - agl-infra-wrappers: @@ -66,16 +67,15 @@ builders: - shell: - !include-raw-escape: - - ../common/include-agl-header.sh - - ../common/include-agl-repo.sh - - ../common/include-agl-select.sh - - ../common/include-agl-source-aglsetup.sh - - ../common/include-agl-auto-conf.sh - - ../common/include-agl-limit-parallelism.sh - - ../common/include-agl-cat-auto-conf.sh - - ../common/include-agl-bitbake-image.sh - - ../common/include-agl-run-test-prepare.sh - - ../common/include-agl-run-test-rsync-changeid.sh - - ../common/include-agl-run-test-short.sh - + !include-raw-escape: + - ../common/include-agl-header.sh + - ../common/include-agl-repo.sh + - ../common/include-agl-select.sh + - ../common/include-agl-source-aglsetup.sh + - ../common/include-agl-auto-conf.sh + - ../common/include-agl-limit-parallelism.sh + - ../common/include-agl-cat-auto-conf.sh + - ../common/include-agl-bitbake-image.sh + - ../common/include-agl-run-test-prepare.sh + - ../common/include-agl-run-test-rsync-changeid.sh + - ../common/include-agl-run-test-short.sh |