diff options
Diffstat (limited to 'jjb/global')
| -rw-r--r-- | jjb/global/basic-jobs.yaml (renamed from jjb/global/basic-jobs.yml) | 0 | ||||
| -rw-r--r-- | jjb/global/installer-params.yaml (renamed from jjb/global/installer-params.yml) | 0 | ||||
| -rw-r--r-- | jjb/global/releng-defaults.yaml (renamed from jjb/global/releng-defaults.yml) | 0 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yaml (renamed from jjb/global/releng-macros.yml) | 55 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml (renamed from jjb/global/slave-params.yml) | 11 |
5 files changed, 51 insertions, 15 deletions
diff --git a/jjb/global/basic-jobs.yml b/jjb/global/basic-jobs.yaml index a8b9cffbc..a8b9cffbc 100644 --- a/jjb/global/basic-jobs.yml +++ b/jjb/global/basic-jobs.yaml diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yaml index f663c4556..f663c4556 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yaml diff --git a/jjb/global/releng-defaults.yml b/jjb/global/releng-defaults.yaml index 2e94767e8..2e94767e8 100644 --- a/jjb/global/releng-defaults.yml +++ b/jjb/global/releng-defaults.yaml diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yaml index b7335fafa..b282cff4f 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yaml @@ -107,6 +107,7 @@ - 'origin/$BRANCH' timeout: 15 per-build-tag: false + skip-tag: true shallow-clone: false use-author: false ignore-notify: false @@ -120,6 +121,17 @@ choosing-strategy: 'gerrit' refspec: '$GERRIT_REFSPEC' <<: *git-scm-defaults + +- scm: + name: git-scm-gerrit-with-submodules + scm: + - git: + choosing-strategy: 'gerrit' + refspec: '$GERRIT_REFSPEC' + submodule: + recursive: true + timeout: 20 + <<: *git-scm-defaults - scm: name: git-scm-with-submodules scm: @@ -129,6 +141,7 @@ refspec: '' branches: - 'refs/heads/{branch}' + per-build-tag: false skip-tag: true wipe-workspace: true submodule: @@ -139,6 +152,8 @@ name: git-scm-openstack scm: - git: &git-scm-openstack-defaults + per-build-tag: false + skip-tag: true url: '$GIT_BASE' branches: - 'origin/$BRANCH' @@ -971,21 +986,31 @@ name: 'report-provision-result' publishers: - postbuildscript: - script-only-if-succeeded: true builders: - - shell: | - echo "export PROVISION_RESULT=PASS" >> $WORKSPACE/installer_track.sh - echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh - echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' >> $WORKSPACE/installer_track.sh - - shell: - !include-raw: installer-report.sh + - role: BOTH + build-on: + - SUCCESS + build-steps: + - shell: | + echo "export PROVISION_RESULT=PASS" >> $WORKSPACE/installer_track.sh + echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh + echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' >> $WORKSPACE/installer_track.sh + - shell: + !include-raw: installer-report.sh + mark-unstable-if-failed: true - postbuildscript: - script-only-if-succeeded: false - script-only-if-failed: true builders: - - shell: | - echo "export PROVISION_RESULT=FAIL" >> $WORKSPACE/installer_track.sh - echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh - echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' >> $WORKSPACE/installer_track.sh - - shell: - !include-raw: installer-report.sh + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - UNSTABLE + build-steps: + - shell: | + echo "export PROVISION_RESULT=FAIL" >> $WORKSPACE/installer_track.sh + echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh + echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' >> $WORKSPACE/installer_track.sh + - shell: + !include-raw: installer-report.sh + mark-unstable-if-failed: true diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yaml index 9d8bed45f..0219be54b 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yaml @@ -278,6 +278,17 @@ description: 'Base URI to the configuration directory' - parameter: + name: 'auto-baremetal-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'auto-baremetal' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + +- parameter: name: 'joid-baremetal-defaults' parameters: - label: |