X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fjjb-macros.yaml;h=c1c6abea06f14e8cfa3b0b3663c5a46360e8d26b;hb=refs%2Fchanges%2F36%2F16536%2F6;hp=8d6428ed01b56e34149cefdc3855df52e60f2eae;hpb=81c6d8a98a8cd035727c63774019ac2e7fcb2a56;p=infra%2Fcicd.git

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 8d6428ed..c1c6abea 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -1,21 +1,4 @@
 ---
-# these parameters are used for infra related variables
-- parameter:
-    name: infra-parameters
-    parameters:
-      - string:
-          name: JJB_GIT_REPO
-          default: https://opendev.org/jjb/jenkins-job-builder.git
-          description: OpenDev JJB repo
-      - string:
-          name: JJB_VERSION
-          default: 2.9.1
-          description: OpenDev JJB version to install - matches to LFN JJB version
-      - string:
-          name: NORDIX_REGISTRY
-          default: registry.nordix.org
-          description: Nordix Container Image Registry
-
 # these parameters are used for setting the Gerrit Project on Nordix
 - parameter:
     name: project-parameters
@@ -149,6 +132,12 @@
       - shell:
           !include-raw: ./verify_geode_tag.sh
 
+- builder:
+    name: 'wait-pkg-mgr-macro'
+    builders:
+      - shell:
+          !include-raw: ./scripts/wait-for-pkg-manager.sh
+
 # defaults for job build history
 - property:
     name: logrotate-default
@@ -472,10 +461,20 @@
     wrappers:
       - credentials-binding:
           - username-password-separated:
-              credential-id: nordix-eiffel-github-token
+              credential-id: nordixinfra-eiffel-username-personal-access-token
               username: NORDIXINFRA_GITHUB_USERNAME
               password: NORDIXINFRA_GITHUB_TOKEN
 
+# wrappers to use for jobs
+- wrapper:
+    name: nordix-gerrit-http-api-token
+    wrappers:
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: nordixinfra-nordix-gerrit-http-api-token
+              username: GERRIT_USER
+              password: GERRIT_API_KEY
+
 # timeout wrapper to use for jobs
 - wrapper:
     name: build-timeout
@@ -515,3 +514,19 @@
           num-to-keep: 100
           artifact-days-to-keep: 30
           artifact-num-to-keep: 100
+
+- property:
+    name: est-ms-teams-rebase-jobs-webhook
+    properties:
+      - office-365-connector:
+            webhooks:
+              - url: "${EST_MS_TEAMS_NORDIX_REBASE_JOBS_WEBHOOK}"
+                name: full
+                start-notification: true
+                notify-success: true
+                notify-aborted: true
+                notify-not-built: true
+                notify-unstable: true
+                notify-failure: true
+                notify-back-to-normal: true
+                notify-repeated-failure: true