Merge "Fix Nokia image generation"

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

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 78f9e2e..826b604 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -42,8 +42,8 @@
           global-settings-type: cfp
           properties:
             - maven.test.skip=true
-            - docker.pull.registry=nexus3.openecomp.org:10001
-            - docker.push.registry=nexus3.openecomp.org:10002
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10002
 
 - builder:
     name: maven-docker-push-daily
@@ -58,8 +58,8 @@
           global-settings-type: cfp
           properties:
             - maven.test.skip=true
-            - docker.pull.registry=nexus3.openecomp.org:10001
-            - docker.push.registry=nexus3.openecomp.org:10003
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
 
 - builder:
     name: docker-login
@@ -68,7 +68,7 @@
 
 # PARAMETERS
 - parameter:
-    name: ecomp-infra-parameters
+    name: infra-parameters
     parameters:
       - string:
           name: PROJECT
@@ -109,9 +109,19 @@
           # yamllint enable
           description: 'Maven selector to be used by shell scripts'
 
+- parameter:
+    name: docker-image-name
+    parameters:
+      - string:
+          name: DOCKER_IMAGE_NAME
+          # yamllint disable rule:line-length
+          default: '{docker-image-name}'
+          # yamllint enable
+          description: 'Docker image name, e.g. onap/appc'
+
 # PROPERTIES
 - property:
-    name: ecomp-infra-properties
+    name: infra-properties
     properties:
       - build-discarder:
           days-to-keep: '{build-days-to-keep}'
@@ -169,7 +179,45 @@
                 unhealthy: 40
 
 - publisher:
-    name: ecomp-infra-shiplogs
+    name: checkstyle-result
+    publishers:
+      - checkstyle:
+          pattern: '**/checkstyle-result.xml'
+          healthy: 0
+          unhealthy: 100
+          health-threshold: 'high'
+          thresholds:
+            unstable:
+              total-all: 30
+              total-high: 15
+              total-normal: 20
+              total-low: 25
+              new-all: 5
+              new-high: 0
+              new-normal: 2
+              new-low: 5
+
+- publisher:
+    name: checkstyle-result-daily
+    publishers:
+      - checkstyle:
+          pattern: '**/checkstyle-result.xml'
+          healthy: 0
+          unhealthy: 100
+          health-threshold: 'high'
+          thresholds:
+            unstable:
+              total-all: 30
+              total-high: 15
+              total-normal: 20
+              total-low: 25
+              new-all: 1
+              new-high: 0
+              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.
@@ -182,7 +230,7 @@
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw: include-raw-deploy-archives.sh
+            - shell: !include-raw-escape: include-raw-deploy-archives.sh
             - maven-target:
                 maven-version: '{maven-version}'
                 pom: '.archives/deploy-archives.xml'
@@ -225,6 +273,8 @@
           skip-tag: true
           timeout: 30
           choosing-strategy: '{choosing-strategy}'
+          submodule:
+            recursive: '{submodule-recursive}'
 
 - scm:
     name: gerrit-trigger-scm-basedir
@@ -358,8 +408,9 @@
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the eCOMP infra.
-    name: ecomp-infra-wrappers
+    name: infra-wrappers
     wrappers:
+      - timestamps
       - timeout:
           type: absolute
           timeout: '{build-timeout}'