Add Sigul bridge IP definition

[ci-management.git] / jjb / global-macros.yaml

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index abf7a83..55711f0 100644 (file)
--- 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'
@@ -452,3 +451,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