From 73a52bd38bdd77654263853950e9c763b230a4f1 Mon Sep 17 00:00:00 2001 From: Lionel Jouin Date: Fri, 9 Sep 2022 11:27:35 +0200 Subject: [PATCH] Meridio: Fix missing container registry credentials - Add wrappers to mask-passwords, add 30min timeout and include the nordix harbor credentials Change-Id: Ie0f82c47b1e5676bb668cfc3254cba89da5fe565 --- jjb/nsm/meridio-periodic.yaml | 8 ++++++-- jjb/nsm/meridio-pull-request.yaml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/jjb/nsm/meridio-periodic.yaml b/jjb/nsm/meridio-periodic.yaml index c36543c1..bac35f2c 100644 --- 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 74a0686b..ad556d0c 100644 --- 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 -- 2.25.1