Switch rest rebase/upstream jobs to Ubuntu 20.04 slave

Change-Id: I5e8b5c99937e10bb80a7425e723b32f67557ec6a

diff --git a/jjb/acumos/global-templates-acumos-push-upstream.yaml b/jjb/acumos/global-templates-acumos-push-upstream.yaml
index 03e6d9efb1dacdc6dac72092800e37cd64a5ba52..d31fb788bd28f7dbeb84d1d279d1f750d970835e 100644 (file)
--- a/jjb/acumos/global-templates-acumos-push-upstream.yaml
+++ b/jjb/acumos/global-templates-acumos-push-upstream.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'acumos-{project-name}-push-upstream'
 
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
 
     disabled: false
 
@@ -37,6 +37,7 @@
       - ssh-agent-credentials:
           users:
             - 'infra-upstream-gerrit-ssh-passphrase'
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/acumos/global-templates-acumos-rebase.yaml b/jjb/acumos/global-templates-acumos-rebase.yaml
index d4c176d16d0c6bd72a2ed9b8954a9b2bd1ef3457..f18732c3f98279fdc008b8cf2c1866cea3734d60 100644 (file)
--- a/jjb/acumos/global-templates-acumos-rebase.yaml
+++ b/jjb/acumos/global-templates-acumos-rebase.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'acumos-{project-name}-rebase'
 
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
 
     disabled: false
 
@@ -39,6 +39,9 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/fast-data-project/global-templates-fdio-push-upstream.yaml b/jjb/fast-data-project/global-templates-fdio-push-upstream.yaml
index b3e4d9a52ee1fda65c13a147558a3f7d0345119d..dc741d3dac541c0ee87a426aeba179eea2b02eb4 100644 (file)
--- a/jjb/fast-data-project/global-templates-fdio-push-upstream.yaml
+++ b/jjb/fast-data-project/global-templates-fdio-push-upstream.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'fdio-{project-name}-push-upstream'
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
     disabled: false
     concurrent: false
 
@@ -34,6 +34,7 @@
       - ssh-agent-credentials:
           users:
             - 'infra-upstream-gerrit-ssh-passphrase'
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/fast-data-project/global-templates-fdio-rebase.yaml b/jjb/fast-data-project/global-templates-fdio-rebase.yaml
index d4a6cebc6b6c93f5d3be68bae1e21cae901b6d9e..e9394bfea66d1c4792b9a84aac4e468a0d3a73e7 100644 (file)
--- a/jjb/fast-data-project/global-templates-fdio-rebase.yaml
+++ b/jjb/fast-data-project/global-templates-fdio-rebase.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'fdio-{project-name}-rebase'
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
     disabled: false
     concurrent: false
 
@@ -36,6 +36,9 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml
index 0cea40999d70ceacfe6d23d8cf5c894e25fce5b9..24dd1d9c98d5a18f7b361dec6fc5ca192ed053fb 100644 (file)
--- a/jjb/global/global-templates-push-upstream.yaml
+++ b/jjb/global/global-templates-push-upstream.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: '{project-name}-{stream}-push-upstream'
 
-    node: onap-ubuntu1604
+    node: onap-ubuntu2004
 
     disabled: false
 
@@ -36,6 +36,7 @@
       - ssh-agent-credentials:
           users:
             - 'infra-upstream-gerrit-ssh-passphrase'
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml
index 7ae7d228d392a2d3612e7f23b8cf41914255b293..65008c4760c7aa82c4d3c656439b543880634bbf 100644 (file)
--- a/jjb/global/global-templates-rebase.yaml
+++ b/jjb/global/global-templates-rebase.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: '{project-name}-{stream}-rebase'
 
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
 
     disabled: false
 
@@ -38,6 +38,9 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/onap/oom/oom-build-jobs.yaml b/jjb/onap/oom/oom-build-jobs.yaml
index 4bac5dbe9a218b282fbff79e612a6d96ded77f86..2db29cfed5d6e1538a941435fbfa3b204f302bb9 100644 (file)
--- a/jjb/onap/oom/oom-build-jobs.yaml
+++ b/jjb/onap/oom/oom-build-jobs.yaml
@@ -31,7 +31,7 @@
 
 - job-template:
     name: 'onap-oom-helm-build-{stream}'
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
     disabled: false
     concurrent: false
 

diff --git a/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml b/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml
index dc0b1dad559dcc73a6ab0db52bac8f0d15da1886..9eea436c4f3ff358b49c62f897a5b52b1c9df75e 100644 (file)
--- a/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml
+++ b/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'opendaylight-{project-name}-push-upstream'
 
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
 
     disabled: false
 
@@ -37,6 +37,7 @@
       - ssh-agent-credentials:
           users:
             - 'infra-upstream-gerrit-ssh-passphrase'
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
index 71be8982f7e215ebaade5eadca1946135b369dcf..cbee1e3656a6e008469ec29d233cdf54313c76c6 100644 (file)
--- a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
+++ b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'opendaylight-{project-name}-rebase'
 
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
 
     disabled: false
 
@@ -39,6 +39,9 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/opendev/global-templates-opendev-push-upstream.yaml b/jjb/opendev/global-templates-opendev-push-upstream.yaml
index cabc612c584592b415310537c4090da4da5cc0a4..7b1b983eeb06075a9dd20af6a79f30ae62448f1b 100644 (file)
--- a/jjb/opendev/global-templates-opendev-push-upstream.yaml
+++ b/jjb/opendev/global-templates-opendev-push-upstream.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'opendev-{project-name}-push-upstream'
 
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
 
     disabled: false
 
@@ -37,6 +37,7 @@
       - ssh-agent-credentials:
           users:
             - 'infra-upstream-gerrit-ssh-passphrase'
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/opendev/global-templates-opendev-rebase.yaml b/jjb/opendev/global-templates-opendev-rebase.yaml
index c8784ae2337cf62aa2d7d6fcaf6e0694d659741b..18006da3ccf012a3b920f4c5c51d658d76b2c6c1 100644 (file)
--- a/jjb/opendev/global-templates-opendev-rebase.yaml
+++ b/jjb/opendev/global-templates-opendev-rebase.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'opendev-{project-name}-rebase'
 
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
 
     disabled: false
 
@@ -39,6 +39,9 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/oransc/global-templates-oran-push-upstream.yaml b/jjb/oransc/global-templates-oran-push-upstream.yaml
index 09d68f1a8750279f8062fa2228b3862022857771..e58f9a7b10e5b8db0de64afcb30d325eca78b478 100644 (file)
--- a/jjb/oransc/global-templates-oran-push-upstream.yaml
+++ b/jjb/oransc/global-templates-oran-push-upstream.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'oransc-{project-name}-push-upstream'
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
     disabled: false
     concurrent: false
 
@@ -34,6 +34,7 @@
       - ssh-agent-credentials:
           users:
             - 'infra-upstream-gerrit-ssh-passphrase'
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:

diff --git a/jjb/oransc/global-templates-oran-rebase.yaml b/jjb/oransc/global-templates-oran-rebase.yaml
index f1e909a02b6f9f4caea836dc6c2594f126a8f0e2..729e547dd1b335673bac3fbe932581c208735a91 100644 (file)
--- a/jjb/oransc/global-templates-oran-rebase.yaml
+++ b/jjb/oransc/global-templates-oran-rebase.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'oransc-{project-name}-rebase'
-    node: infra-ubuntu1804
+    node: infra-ubuntu2004
     disabled: false
     concurrent: false
 
@@ -36,6 +36,9 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell: