From aaa0d451e7af4718cfec569111a3d82c2368a65a Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Fri, 21 Jan 2022 15:10:34 +0000 Subject: [PATCH] Switch rest rebase/upstream jobs to Ubuntu 20.04 slave Change-Id: I5e8b5c99937e10bb80a7425e723b32f67557ec6a --- jjb/acumos/global-templates-acumos-push-upstream.yaml | 3 ++- jjb/acumos/global-templates-acumos-rebase.yaml | 5 ++++- .../global-templates-fdio-push-upstream.yaml | 3 ++- jjb/fast-data-project/global-templates-fdio-rebase.yaml | 5 ++++- jjb/global/global-templates-push-upstream.yaml | 3 ++- jjb/global/global-templates-rebase.yaml | 5 ++++- jjb/onap/oom/oom-build-jobs.yaml | 2 +- .../global-templates-opendaylight-push-upstream.yaml | 3 ++- jjb/opendaylight/global-templates-opendaylight-rebase.yaml | 5 ++++- jjb/opendev/global-templates-opendev-push-upstream.yaml | 3 ++- jjb/opendev/global-templates-opendev-rebase.yaml | 5 ++++- jjb/oransc/global-templates-oran-push-upstream.yaml | 3 ++- jjb/oransc/global-templates-oran-rebase.yaml | 5 ++++- 13 files changed, 37 insertions(+), 13 deletions(-) diff --git a/jjb/acumos/global-templates-acumos-push-upstream.yaml b/jjb/acumos/global-templates-acumos-push-upstream.yaml index 03e6d9efb..d31fb788b 100644 --- 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 d4c176d16..f18732c3f 100644 --- 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 b3e4d9a52..dc741d3da 100644 --- 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 d4a6cebc6..e9394bfea 100644 --- 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 0cea40999..24dd1d9c9 100644 --- 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 7ae7d228d..65008c476 100644 --- 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 4bac5dbe9..2db29cfed 100644 --- 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 dc0b1dad5..9eea436c4 100644 --- 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 71be8982f..cbee1e365 100644 --- 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 cabc612c5..7b1b983ee 100644 --- 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 c8784ae23..18006da3c 100644 --- 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 09d68f1a8..e58f9a7b1 100644 --- 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 f1e909a02..729e547dd 100644 --- 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: -- 2.25.1