From: robert.tomczyk Date: Fri, 21 Jan 2022 15:10:34 +0000 (+0000) Subject: Switch rest rebase/upstream jobs to Ubuntu 20.04 slave X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;ds=inline;h=refs%2Fchanges%2F14%2F12114%2F1;p=infra%2Fcicd.git 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 03e6d9ef..d31fb788 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 d4c176d1..f18732c3 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 b3e4d9a5..dc741d3d 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 d4a6cebc..e9394bfe 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 0cea4099..24dd1d9c 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 7ae7d228..65008c47 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 4bac5dbe..2db29cfe 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 dc0b1dad..9eea436c 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 71be8982..cbee1e36 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 cabc612c..7b1b983e 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 c8784ae2..18006da3 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 09d68f1a..e58f9a7b 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 f1e909a0..729e547d 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: