X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=50a9a573a631f6c1c60b2eca7355aba883a75e77;hb=2f42ab9471e3cc478dd6eccd9b9dbce4ca9b15fe;hp=1f751da62b8c73754ecdef809a0d4bbdc9889972;hpb=703c235b70041610c4eab23f2f42b5f4429f5fab;p=ci-management.git
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 1f751da62..50a9a573a 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -24,43 +24,42 @@
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}'
pom: '{pom}'
- goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
+ goals: 'clean deploy -B -P {mvn-profile}'
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: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'
@@ -240,35 +239,6 @@
new-normal: 1
new-low: 1
-- publisher:
- name: infra-shiplogs
- # lf-infra macro to finish up a build.
- #
- # Handles the following:
- # - Shipping logs to Nexus logs site repository
- # - Cleanup workspace
- publishers:
- - postbuildscript:
- builders:
- - role: BOTH
- build-on:
- - ABORTED
- - FAILURE
- - NOT_BUILT
- - SUCCESS
- - UNSTABLE
- build-steps:
- - lf-infra-sysstat
- - lf-infra-ship-logs
- mark-unstable-if-failed: true
- - workspace-cleanup:
- exclude:
- # Do not clean up *.jenkins-trigger files for jobs that use a
- # properties file as input for triggering another build.
- - '**/*.jenkins-trigger'
- fail-build: false
-
-
# SCMS
- scm:
name: git-scm
@@ -392,6 +362,49 @@
- 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-no-code-change: 'false'
+ exclude-trivial-rebase: 'true'
+ exclude-wip: 'true'
+ - 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:
@@ -428,7 +441,7 @@
fail: true
- wrapper:
- name: golang
+ name: golang110
wrappers:
- raw:
xml: |
@@ -436,6 +449,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.