X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fglobal-macros.yaml;h=c78301521638051cafc64ab22e51c46718de7dd6;hb=71081422ce2a3b1b0c33599e5acc7dc137f53725;hp=1f751da62b8c73754ecdef809a0d4bbdc9889972;hpb=adeda5ac33fdb2dfe4be6a0455e726d2e9b1b1c4;p=ci-management.git
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 1f751da62..c78301521 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'
@@ -392,6 +391,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: '^verify-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-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 +469,7 @@
fail: true
- wrapper:
- name: golang
+ name: golang110
wrappers:
- raw:
xml: |
@@ -436,6 +477,24 @@
Golang 1.10
+- wrapper:
+ name: golang111
+ wrappers:
+ - raw:
+ xml: |
+
+ Golang 1.11
+
+
+- wrapper:
+ name: golang112
+ wrappers:
+ - raw:
+ xml: |
+
+ Golang 1.12
+
+
- wrapper:
# This wrapper is required for all jobs as it configures the wrappers
# needed by the eCOMP infra.