From af0bdf0d1c86c7ea85bbdfd25a818eccf4cf9b52 Mon Sep 17 00:00:00 2001 From: Bengt Thuree Date: Fri, 16 Sep 2022 19:15:15 +1000 Subject: [PATCH] Chore: Move to centos8-builder jjb/testsuite/testsuite.yaml jjb/usecaseui/usecase-ui-intent-analysis.yaml jjb/usecaseui/usecase-ui-nlp.yaml jjb/usecaseui/usecase-ui-server.yaml jjb/usecaseui/usecase-ui.yaml jjb/vfc/vfc-gvnfm-vnflcm-java.yaml jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml jjb/vfc/vfc-gvnfm-vnfres-java.yaml jjb/vfc/vfc-nfvo-db.yaml jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml jjb/vfc/vfc-nfvo-lcm-java.yaml jjb/vnfrqts/vnfrqts-epics.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree Change-Id: I30443b5195bd75b0763b7a026c7e8494b09701fc --- jjb/testsuite/testsuite.yaml | 2 +- jjb/usecaseui/usecase-ui-intent-analysis.yaml | 4 ++-- jjb/usecaseui/usecase-ui-nlp.yaml | 4 ++-- jjb/usecaseui/usecase-ui-server.yaml | 4 ++-- jjb/usecaseui/usecase-ui.yaml | 4 ++-- jjb/vfc/vfc-gvnfm-vnflcm-java.yaml | 4 ++-- jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml | 4 ++-- jjb/vfc/vfc-gvnfm-vnfres-java.yaml | 4 ++-- jjb/vfc/vfc-nfvo-db.yaml | 4 ++-- jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 4 ++-- jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml | 4 ++-- jjb/vfc/vfc-nfvo-lcm-java.yaml | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index bc62ee4fb..db3e73034 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -34,7 +34,7 @@ project-name: testsuite jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: testsuite branch: master diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml index 04095f20c..92cc787c7 100644 --- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -67,6 +67,6 @@ project-name: usecase-ui-intent-analysis jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/intent-analysis branch: master diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index 0ea30f050..ef52d2c94 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -61,7 +61,7 @@ project-name: usecase-ui-nlp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/nlp branch: master diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 7933e36d4..86dfa309a 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -61,6 +61,6 @@ project-name: usecase-ui-server jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/server branch: master diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 2c95ecfcf..518f73ef2 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -20,7 +20,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -49,6 +49,6 @@ project-name: usecase-ui jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index e797c3f9c..4fc3df1a0 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -22,7 +22,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -70,6 +70,6 @@ project-name: vfc-gvnfm-vnflcm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnflcm branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 190481392..5df66c4b6 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -16,7 +16,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -64,6 +64,6 @@ project-name: vfc-gvnfm-vnfmgr jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnfmgr branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 798f9fce2..54509ea25 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -65,6 +65,6 @@ project-name: vfc-gvnfm-vnfres jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnfres branch: master diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 679cc45e3..258ae31f2 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -30,6 +30,6 @@ project-name: vfc-nfvo-db jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/db branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 00d2d23fa..5d975c437 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'huawei/pom.xml' mvn-params: '-f huawei/pom.xml' @@ -65,6 +65,6 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/driver/vnfm/svnfm branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 212988365..e7796972b 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'gvnfmadapter/pom.xml' mvn-params: '-f gvnfmadapter/pom.xml' @@ -67,6 +67,6 @@ project-name: vfc-nfvo-driver-vnfm-gvnfm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/driver/vnfm/gvnfm branch: master diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index add2502dd..24f98c12b 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -12,7 +12,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -59,6 +59,6 @@ project-name: vfc-nfvo-lcm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/lcm branch: master -- 2.16.6