X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=0c614bf85bc7390c08031211422e50e9b5d137b9;hb=c1e11d289682926cbf35ee47a6d72d697089f7fc;hp=6be0e0f941dc1de047f4a059a55cf50a7a731e81;hpb=85b44e87880d483e9b7106f3031a47d0be5b8800;p=ci-management.git
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 6be0e0f94..0c614bf85 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -4,12 +4,6 @@
# vim: sw=2 ts=2 sts=2 et :
# BUILDERS
-- builder:
- name: ci-management-check-unicode
- builders:
- - shell: |
- $WORKSPACE/scripts/check-unicode.sh jjb/
-
- builder:
name: provide-maven-settings
builders:
@@ -30,23 +24,21 @@
goals: '--version'
- builder:
- name: maven-docker-push-release
+ name: maven-set-release-version
builders:
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean deploy -B -P {mvn-profile}'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
+ properties:
+ - 'newVersion=${{release_version}}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
global-settings-type: cfp
- properties:
- - maven.test.skip=true
- - docker.pull.registry=nexus3.onap.org:10001
- - docker.push.registry=nexus3.onap.org:10002
- builder:
- name: maven-docker-push-daily
+ name: maven-docker-push-release
builders:
- maven-target:
maven-version: '{maven-version}'
@@ -59,15 +51,15 @@
properties:
- maven.test.skip=true
- docker.pull.registry=nexus3.onap.org:10001
- - docker.push.registry=nexus3.onap.org:10003
+ - docker.push.registry=nexus3.onap.org:10002
- builder:
- name: maven-docker-push-daily-test
+ name: maven-docker-push-daily
builders:
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean deploy -B -P {mvn-profile}'
+ goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
@@ -122,6 +114,14 @@
default: '$JOB_NAME-$BUILD_NUMBER'
description: 'Used by Heat to generate a unique stack & vm name'
+- parameter:
+ name: maven-params
+ parameters:
+ - string:
+ name: MAVEN_PARAMS
+ default: '{mvn-params}'
+ description: Maven parameters to pass to the mvn command.
+
- parameter:
name: maven-exec
parameters:
@@ -239,37 +239,6 @@
new-normal: 1
new-low: 1
-- publisher:
- name: infra-shiplogs
- # To archive things, the job will need to create an "archives" directory in
- # the workspace and this macro will handle copying the contents of the
- # archives directory.
- #
- # Uses the build parameter ARCHIVE_ARTIFACTS if not empty to find files to
- # archive. You can pass globstar patterns for example "**/*.xml **/*.log" as
- # the archive pattern. This is a space separated list of files to archive.
- #
- # Also ensure that the workspace is cleaned up at the end of the build.
- publishers:
- - postbuildscript:
- builders:
- - shell: !include-raw-escape: include-raw-deploy-archives.sh
- - maven-target:
- maven-version: '{maven-version}'
- pom: '.archives/deploy-archives.xml'
- goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
- settings: 'jenkins-log-archives-settings'
- settings-type: cfp
- global-settings: 'global-settings'
- global-settings-type: cfp
- - description-setter:
- regexp: '^Build logs: .*'
- script-only-if-succeeded: false
- script-only-if-failed: false
- mark-unstable-if-failed: true
- - workspace-cleanup:
- fail-build: false`
-
# SCMS
- scm:
name: git-scm
@@ -393,6 +362,48 @@
- compare-type: 'ANT'
pattern: '{files}'
+- trigger:
+ name: gerrit-trigger-helm-patch-submitted
+ triggers:
+ - gerrit:
+ server-name: '{server}'
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: 'ANT'
+ pattern: '{files}'
+
+- trigger:
+ name: gerrit-trigger-helm-patch-merged
+ triggers:
+ - gerrit:
+ server-name: '{server}'
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: '^remerge-helm$'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: 'ANT'
+ pattern: '{files}'
+
- trigger:
name: gerrit-trigger-release-manually
triggers:
@@ -429,7 +440,7 @@
fail: true
- wrapper:
- name: golang
+ name: golang110
wrappers:
- raw:
xml: |
@@ -437,6 +448,33 @@
Golang 1.10
+- wrapper:
+ name: golang111
+ wrappers:
+ - raw:
+ xml: |
+
+ Golang 1.11
+
+
+- wrapper:
+ name: golang112
+ wrappers:
+ - raw:
+ xml: |
+
+ Golang 1.12
+
+
+- wrapper:
+ name: golang114
+ wrappers:
+ - raw:
+ xml: |
+
+ Golang 1.14
+
+
- wrapper:
# This wrapper is required for all jobs as it configures the wrappers
# needed by the eCOMP infra.
@@ -453,3 +491,20 @@
- 'onap-jenkins-ssh'
- openstack:
single-use: true
+
+- wrapper:
+ # This wrapper is used for docker build jobs to use the dedicated docker
+ # build VM and turn off OpenStack single-use
+ name: infra-wrappers-docker-build
+ wrappers:
+ - timestamps
+ - timeout:
+ type: absolute
+ timeout: '{build-timeout}'
+ timeout-var: 'BUILD_TIMEOUT'
+ fail: true
+ - ssh-agent-credentials:
+ users:
+ - 'onap-jenkins-ssh'
+ - openstack:
+ single-use: false