diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-08-02 14:10:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2017-08-02 14:10:25 +0000 |
| commit | 89ed03180ef57da85feade45da507e62b5af9c49 (patch) | |
| tree | 3efa4e4f964b42f98cf832ca55250129fbc9d38b /jjb | |
| parent | f6c75bebd9aedee706b8271fcb8ea28659b3c61c (diff) | |
| parent | a1c66436bdfc4778b066e65ddaa1a228181becec (diff) | |
Merge "Improve packer verify and build jobs"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 28 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 6 |
2 files changed, 26 insertions, 8 deletions
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 07811ea5..5407073f 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -113,8 +113,17 @@ choosing-strategy: 'gerrit' wrappers: - - agl-infra-wrappers: - build-timeout: '{build-timeout}' + - timeout: + type: absolute + timeout: '{build-timeout}' + timeout-var: 'BUILD_TIMEOUT' + fail: true + - ssh-agent-credentials: + users: + - 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8' + - ansicolor + - openstack: + single-use: false triggers: - gerrit-trigger-patch-submitted: @@ -153,22 +162,29 @@ choosing-strategy: 'gerrit' wrappers: + - timeout: + type: absolute + timeout: '{build-timeout}' + timeout-var: 'BUILD_TIMEOUT' + fail: true - ssh-agent-credentials: users: - - '{ssh-credentials}' - - agl-infra-wrappers: - build-timeout: '{build-timeout}' + - 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8' + - ansicolor + - openstack: + single-use: false triggers: - timed: '00 10 1 * *' - gerrit: + server-name: 'gerrit.automotivelinux.org' trigger-on: - change-merged-event - comment-added-contains-event: comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' - project-pattern: 'ci-management' + project-pattern: '{name}' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index c73bd861..19a794b0 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -456,17 +456,19 @@ templates="../packer/templates/*" provision="../packer/provision/*.sh" for v in $varfiles; do - [[ "${v##*/}" =~ ^(cloud-env.*|README.*)$ ]] && continue + [[ ${v##*/} =~ ^(cloud-env.*|lava-env.*|README.md)$ ]] && continue for t in $templates; do + [[ ${t##*/} =~ ^(cloud-env.*|lava-env.*|README.md)$ ]] && continue export PACKER_LOG="yes" && \ export PACKER_LOG_PATH="packer-validate-${v##*/}-${t##*/}.log" && \ packer.io validate -var-file=$CLOUDENV \ -var-file=$v $t if [ $? -ne 0 ]; then - break + exit 1 fi done done + # todo: migrate to linting with shellcheck for p in $provision; do /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1 done |