Meridio: Fix missing container registry credentials

- Add wrappers to mask-passwords, add 30min timeout and include the
  nordix harbor credentials

Change-Id: Ie0f82c47b1e5676bb668cfc3254cba89da5fe565

diff --git a/jjb/nsm/meridio-periodic.yaml b/jjb/nsm/meridio-periodic.yaml
index c36543c15746270ce6ff5f5d55e7746c9ee13ed1..bac35f2c7573c8140618b696eced96c914238179 100644 (file)
--- a/jjb/nsm/meridio-periodic.yaml
+++ b/jjb/nsm/meridio-periodic.yaml
@@ -38,8 +38,6 @@
 
     concurrent: true
 
-    node: nordix-nsm-build-ubuntu1804
-
     properties:
       - github:
           url: https://github.com/Nordix/Meridio
@@ -90,6 +88,12 @@
       - pollscm:
           cron: '@midnight'
 
+    wrappers:
+      - build-timeout:
+          timeout: 30
+      - nordixinfra-harbor-creds-wrapper
+      - mask-passwords
+
     dsl: 
       !include-raw-escape: Jenkinsfile
 

diff --git a/jjb/nsm/meridio-pull-request.yaml b/jjb/nsm/meridio-pull-request.yaml
index 74a0686b7adcb72742aa3aa92662b67cdecf96dc..ad556d0c449a4e5cf4990d83dc970dd13d6c0256 100644 (file)
--- a/jjb/nsm/meridio-pull-request.yaml
+++ b/jjb/nsm/meridio-pull-request.yaml
@@ -39,8 +39,6 @@
 
     concurrent: true
 
-    node: nordix-nsm-build-ubuntu1804
-
     properties:
       - github:
           url: https://github.com/Nordix/Meridio
@@ -100,5 +98,11 @@
           only-trigger-phrase: false
           cron: 'H/5 * * * *'
 
+    wrappers:
+      - build-timeout:
+          timeout: 30
+      - nordixinfra-harbor-creds-wrapper
+      - mask-passwords
+
     dsl: 
       !include-raw-escape: Jenkinsfile