Merge "Add a few checks in jjb/doc/rules.yaml"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Wed, 29 Mar 2023 17:44:31 +0000 (17:44 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 29 Mar 2023 17:44:31 +0000 (17:44 +0000)
118 files changed:
jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml [new file with mode: 0644]
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/ci-management/ci-management.yaml
jjb/cli/cli.yaml
jjb/cps/cps-cps-tbdmt.yaml
jjb/cps/cps-cps-temporal.yaml
jjb/cps/cps-ncmp-dmi-plugin.yaml
jjb/cps/cps.yaml
jjb/dcaegen2/dcaegen2-analytics-flink.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-analytics.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/integration/docker/integration-docker-onap-java11.yaml
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/prepare-csit.sh
jjb/integration/run-csit.sh
jjb/integration/simulators/integration-onap-components-simulators.yaml [new file with mode: 0644]
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
jjb/integration/xtesting/integration-xtesting.yaml
jjb/lf-infra-sandbox-3.yaml
jjb/modeling/modeling-etsicatalog.yaml
jjb/modeling/modeling-modelspec.yaml
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-framework.yaml
jjb/multicloud/multicloud-info.yaml
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music-distributed-kv-store.yaml
jjb/music/music-jar.yaml
jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml
jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
jjb/oom-utils/oom-utils.yaml
jjb/oom/offline-installer.yaml
jjb/oom/oom-consul.yaml
jjb/oom/oom-oneclick-config.yaml
jjb/oom/oom-readiness.yaml
jjb/oom/oom-registrator.yaml
jjb/oparent/oparent.yaml
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-clamp.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-gui.yaml
jjb/policy/policy-k8s-csit.yaml [new file with mode: 0644]
jjb/policy/policy-models.yaml
jjb/policy/policy-pap.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-xacml-pdp.yaml
jjb/portal-ng/portal-ng-history.yaml [new file with mode: 0644]
jjb/portal-ng/portal-ng-ui.yaml [new file with mode: 0644]
jjb/relman/relman.yaml
jjb/rtdv3/rtdv3.yaml
jjb/sdc/sdc-sdc-docker-base.yaml [deleted file]
jjb/so/so-adapters-so-cnf-adapter.yaml
jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
jjb/so/so-adapters-so-nssmf-adapter.yaml
jjb/so/so-adapters-so-oof-adapter.yaml
jjb/so/so-libs.yaml
jjb/so/so-so-admin-cockpit.yaml
jjb/so/so-so-etsi-nfvo.yaml
jjb/so/so.yaml
jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
jjb/testsuite/testsuite-cds-mock-odl.yaml
jjb/testsuite/testsuite-cds-mock-server.yaml
jjb/testsuite/testsuite-cds-mock-ssh.yaml
jjb/testsuite/testsuite-cds.yaml
jjb/testsuite/testsuite-oom.yaml
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-lcm-java.yaml
jjb/vnfrqts/vnfrqts-epics.yaml
jjb/vnfrqts/vnfrqts-guidelines.yaml
jjb/vnfrqts/vnfrqts-requirements.yaml
jjb/vnfrqts/vnfrqts-testcases.yaml
jjb/vnfrqts/vnfrqts-usecases.yaml
jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
jjb/vnfsdk/vnfsdk-functest.yaml
jjb/vnfsdk/vnfsdk-lctest.yaml
jjb/vnfsdk/vnfsdk-model.yaml
jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vvp/vvp-documentation.yaml
jjb/vvp/vvp-em.yaml
jjb/vvp/vvp-oom.yaml
jjb/vvp/vvp-regression.yaml
packer/templates/helm.json
packer/templates/redis.json

diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg
new file mode 100644 (file)
index 0000000..d7d096c
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297
+LABELS=centos8-docker-4c-4g
+HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml
new file mode 100644 (file)
index 0000000..f294117
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "portal-ng-history"
+comment: "portal-ng-history"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..8f92057
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..4c5895e
--- /dev/null
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "ecomp-snapshots"
+    credentialsId: "portal-ng-history"
+  - serverId: "ecomp-site"
+    credentialsId: "portal-ng-history"
+  - serverId: "ecomp-staging"
+    credentialsId: "portal-ng-history"
+  - serverId: "nexus3.onap.org:10001"
+    credentialsId: "portal-ng-history"
+  - serverId: "nexus3.onap.org:10002"
+    credentialsId: "portal-ng-history"
+  - serverId: "nexus3.onap.org:10003"
+    credentialsId: "portal-ng-history"
+  - serverId: "nexus3.onap.org:10004"
+    credentialsId: "portal-ng-history"
+  - serverId: "docker.io"
+    credentialsId: "onap_dockerhub_creds"
\ No newline at end of file
index 74c9f96..a589c61 100644 (file)
@@ -10,7 +10,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     build-timeout: 90
 
     platforms:
@@ -32,7 +32,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     build-timeout: 90
 
     platforms:
@@ -56,7 +56,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     build-timeout: 90
 
     platforms:
@@ -76,7 +76,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
     platforms:
       - centos-7
@@ -95,7 +95,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
     platforms:
       - ubuntu-18.04
index f6000c7..9a64462 100644 (file)
@@ -10,7 +10,7 @@
     project-name: ci-management
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: ci-management
     branch: master
 
@@ -29,7 +29,7 @@
     archive-artifacts: '**/*.log'
     branch: 'master'
     build-timeout: '60'
-    build-node: 'centos7-builder-2c-1g'
+    build-node: 'centos8-builder-2c-1g'
     jjb-version: 4.1.0
     # configure the gerrit-jjb-verify job
     build-node-label-check: true
@@ -42,7 +42,7 @@
 
     project: ci-management
     project-name: ci-management
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
     jenkins-urls: >
         https://jenkins.onap.org
@@ -60,7 +60,7 @@
     archive-artifacts: '**/*.log'
     jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     # update-cloud-image: true
     build-timeout: 10
 
index 8733f3d..bec3795 100644 (file)
       - '{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:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -93,7 +93,7 @@
     project-name: cli
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: cli
     branch: master
 
index 1743613..60b4758 100644 (file)
@@ -9,7 +9,7 @@
     name: cps-tbdmt-info
     project: cps/cps-tbdmt
     project-name: cps-cps-tbdmt
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -25,7 +25,7 @@
       project-name: cps-cps-tbdmt
       branch: 'master'
       mvn-settings: 'cps-cps-tbdmt-settings'
-      build-node: centos7-docker-8c-8g
+      build-node: centos8-docker-8c-8g
 
 - project:
       name: cps-tbdmt
           - gerrit-maven-merge
           - gerrit-maven-stage:
                 sign-artifacts: true
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
                 mvn-params: '-P docker'
                 container-public-registry: 'nexus3.onap.org:10001'
@@ -58,7 +58,7 @@
       mvn-settings: 'cps-cps-tbdmt-settings'
       files: '**'
       archive-artifacts: ''
-      build-node: centos7-docker-8c-8g
+      build-node: centos8-docker-8c-8g
 
 - project:
       name: cps-tbdmt-sonar
@@ -72,7 +72,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: centos7-docker-8c-8g
+      build-node: centos8-docker-8c-8g
       project: 'cps/cps-tbdmt'
       project-name: 'cps-cps-tbdmt'
       branch: 'master'
@@ -92,7 +92,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-qualitygate-wait: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps/cps-tbdmt'
     project-name: 'cps-cps-tbdmt'
     branch: 'master'
index 75e9313..f2115e2 100644 (file)
@@ -9,7 +9,7 @@
     name: cps-cps-temporal-info
     project: cps/cps-temporal
     project-name: cps-cps-temporal
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -29,7 +29,7 @@
           container-public-registry: nexus3.onap.org:10001
           container-snapshot-registry: nexus3.onap.org:10003
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: -Pdocker
           container-public-registry: nexus3.onap.org:10001
@@ -48,7 +48,7 @@
     mvn-settings: cps-cps-temporal-settings
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-cps-temporal-clm
@@ -62,7 +62,7 @@
     project-name: cps-cps-temporal
     branch: master
     mvn-settings: cps-cps-temporal-settings
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-cps-temporal-sonar
@@ -76,7 +76,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps/cps-temporal'
     project-name: 'cps-cps-temporal'
     branch: 'master'
@@ -96,7 +96,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-qualitygate-wait: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps/cps-temporal'
     project-name: 'cps-cps-temporal'
     branch: 'master'
index 7ec0f75..61a4e2e 100644 (file)
@@ -9,7 +9,7 @@
     name: cps-ncmp-dmi-plugin-info
     project: cps/ncmp-dmi-plugin
     project-name: cps-ncmp-dmi-plugin
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
       - gerrit-maven-merge
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: -Pdocker
           container-public-registry: nexus3.onap.org:10001
@@ -51,7 +51,7 @@
     mvn-settings: cps-ncmp-dmi-plugin-settings
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-ncmp-dmi-plugin-clm
@@ -65,7 +65,7 @@
     project-name: cps-ncmp-dmi-plugin
     branch: master
     mvn-settings: cps-ncmp-dmi-plugin-settings
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-ncmp-dmi-plugin-sonar
@@ -79,7 +79,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps/ncmp-dmi-plugin'
     project-name: 'cps-ncmp-dmi-plugin'
     branch: 'master'
@@ -99,7 +99,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-qualitygate-wait: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps/ncmp-dmi-plugin'
     project-name: 'cps-ncmp-dmi-plugin'
     branch: 'master'
index 9147565..a56a50e 100644 (file)
@@ -9,7 +9,7 @@
     name: cps-info
     project: cps
     project-name: cps
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -25,7 +25,7 @@
       project-name: 'cps'
       branch: 'master'
       mvn-settings: 'cps-settings'
-      build-node: centos7-docker-8c-8g
+      build-node: centos8-docker-8c-8g
 
 - project:
     name: cps
           mvn-params: "-P cps-ncmp-docker"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P cps-ncmp-docker'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -64,7 +64,7 @@
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-sonar
@@ -78,7 +78,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps'
     project-name: 'cps'
     branch: 'master'
@@ -98,7 +98,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-qualitygate-wait: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps'
     project-name: 'cps'
     branch: 'master'
index 9d76d41..6b9321c 100644 (file)
@@ -4,6 +4,6 @@
     project-name: dcaegen2-analytics-flink
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/analytics/flink
     branch: master
index c4d6126..68d39e9 100644 (file)
@@ -17,7 +17,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
     project: 'dcaegen2/analytics/tca-gen2'
     # job template iterators
@@ -81,6 +81,6 @@
     project-name: dcaegen2-analytics-tca-gen2
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/analytics/tca-gen2
     branch: master
index 80ac689..aa66495 100644 (file)
@@ -4,6 +4,6 @@
     project-name: dcaegen2-analytics
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/analytics
     branch: master
index f2f6621..85252e0 100644 (file)
@@ -28,7 +28,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -75,6 +75,6 @@
     project-name: dcaegen2-collectors-datafile
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors/datafile
     branch: master
index 4ad47ab..5074a0c 100644 (file)
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: integration-docker-onap-java11-info
-    project-name: integration-docker-onap-java11
+    name: integration-docker-onap-java-info
+    project-name: integration-docker-onap-java
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
@@ -9,9 +9,9 @@
     branch: master
 
 - project:
-      name: integration-docker-onap-java11-linters
+      name: integration-docker-onap-java-linters
       project: integration/docker/onap-java11
-      project-name: integration-docker-onap-java11
+      project-name: integration-docker-onap-java
       python-version: python3
       jobs:
           - integration-linters
@@ -37,8 +37,8 @@
                 branch: 'master'
 
 - project:
-    name: integration-docker-onap-java11-release
-    project-name: 'integration-docker-onap-java11'
+    name: integration-docker-onap-java-release
+    project-name: 'integration-docker-onap-java'
     project: 'integration/docker/onap-java11'
     mvn-settings: 'integration-settings'
     jobs:
           build-node: centos7-docker-8c-8g
 
 - project:
-    name: 'integration-docker-onap-java11-docker'
+    name: 'integration-docker-onap-java-docker'
     jobs:
-      - gerrit-docker-verify
-      - gerrit-docker-merge
-    project-name: 'integration-docker-onap-java11'
+      - gerrit-docker-verify:
+          project-name: 'integration-docker-onap-java11'
+          docker-name: 'onap/integration-java11'
+      - gerrit-docker-merge:
+          project-name: 'integration-docker-onap-java11'
+          docker-name: 'onap/integration-java11'
+      - gerrit-docker-verify:
+          project-name: 'integration-docker-onap-java17'
+          docker-name: 'onap/integration-java17'
+          docker-build-args: '--build-arg java_ver=onap-java17'
+      - gerrit-docker-merge:
+          project-name: 'integration-docker-onap-java17'
+          docker-name: 'onap/integration-java17'
+          docker-build-args: '--build-arg java_ver=onap-java17'
     project: 'integration/docker/onap-java11'
     stream:
       - 'master':
             branch: 'master'
             files: ''
-    docker-name: 'onap/integration-java11'
-    docker-build-args: '-f ./Dockerfile'
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
     build-node: ubuntu1804-docker-8c-8g
index 71cbbfa..920d5ed 100644 (file)
 - builder:
     name: integration-run-test
     builders:
-      - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
+      - shell: |
+          git clone https://gerrit.onap.org/r/ci-management /tmp/ci-management
+          cp /tmp/ci-management/jjb/integration/*csit.sh ${WORKSPACE}
+          ${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}
 
 - builder:
     name: integration-run-project-test
index 77be42b..34e3ed6 100644 (file)
@@ -57,7 +57,7 @@
     id: integration-linters
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos8-builder-2c-1g
     node: '{build-node}'
 
     parameters:
index 0db140f..dc732c6 100644 (file)
@@ -96,9 +96,13 @@ if [[ -f "${ROBOT3_VENV}/bin/activate" ]]; then
     source "${ROBOT3_VENV}/bin/activate"
 else
     # Robot framework was not found
-    #  clone ci-management repository and use install script
-    git clone "https://gerrit.onap.org/r/ci-management" \
+    #  Clone/update ci-management repository and invoke install script
+    if [[ ! -d /tmp/ci-management ]]; then
+        git clone "https://gerrit.onap.org/r/ci-management" \
         /tmp/ci-management
+    else
+        git pull /tmp/ci-management
+    fi
     # shellcheck disable=SC1090
     source "/tmp/ci-management/jjb/integration/${ROBOT_INSTALLER}"
 fi
index 877cebb..4ee5d75 100644 (file)
 
 echo "---> run-csit.sh"
 
-WORKDIR=$(mktemp -d --suffix=-robot-workdir)
-
-# Exit if no arguments are provided and required variables not set
-if [[ $# -eq 0 ]] && [[ -z "${TESTPLAN}" ]] && [[ -z "${TESTOPTIONS}" ]]; then
-    echo
-    echo "Usage: $0 plans/<project>/<functionality> [<robot-options>]"
-    echo
-    echo " <project>, <functionality>, <robot-options>:  "
-    echo "  The same values as for the JJB job template:"
-    echo '  {project}-csit-{functionality}'
-    echo
-    exit 1
-
-elif [[ $# -ne 2 ]] && [[ -z "${TESTPLAN}" ]] && [[ -z "${TESTOPTIONS}" ]]; then
-    echo
-    echo "Script called without arguments, but the following variables"
-    echo " must be set: {TESTPLAN} {TESTOPTIONS}"
-    echo
-    exit 1
-
-elif [[ $# -eq 2 ]]; then
-    export TESTPLAN=$1; export TESTOPTIONS=$2
-fi
-
-# Python version should match that used to setup
-#  robot-framework in other jobs/stages
-# Use pyenv for selecting the python version
-if [[ -d "/opt/pyenv" ]]; then
-    echo "Setup pyenv:"
-    export PYENV_ROOT="/opt/pyenv"
-    export PATH="$PYENV_ROOT/bin:$PATH"
-    pyenv versions
-    if command -v pyenv 1>/dev/null 2>&1; then
-        eval "$(pyenv init - --no-rehash)"
-        # Choose the latest numeric Python version from installed list
-        version=$(pyenv versions --bare \
-            | sed '/^[^0-9]/d' | sort -V | tail -n 1)
-        pyenv local "${version}"
-    fi
-fi
-
 #
 # functions
 #
 
-# load the saved set options
-function load_set {
-    _setopts="$-"
-
-    # bash shellopts
-    for i in $(echo "$SHELLOPTS" | tr ':' ' ') ; do
-        set +o "${i}"
-    done
-    for i in $(echo "$RUN_CSIT_SHELLOPTS" | tr ':' ' ') ; do
-        set -o "${i}"
-    done
-
-    # other options
-    for i in $(echo "$_setopts" | sed 's/./& /g') ; do
-        set +"${i}"
-    done
-    set -"${RUN_CSIT_SAVE_SET}"
-}
-
-# set options for quick bailout when error
-function harden_set {
-    set -xeo pipefail
-    set +u # enabled it would probably fail too many often
-}
-
-# relax set options so the sourced file will not fail
-# the responsibility is shifted to the sourced file...
-function relax_set {
-    set +e
-    set +o pipefail
-}
-
-# save current set options
-function save_set {
-    RUN_CSIT_SAVE_SET="$-"
-    RUN_CSIT_SHELLOPTS="$SHELLOPTS"
-}
-
-# wrapper for sourcing a file
-function source_safely {
-    if [[ -z "$1" ]] && return 1; then
-        relax_set
-        # shellcheck disable=SC1090
-        source "$1"
-        load_set
-    fi
-}
-
 function on_exit {
     rc=$?
     if [[ ${WORKSPACE} ]]; then
@@ -128,10 +39,11 @@ function on_exit {
     # Run teardown script plan if it exists
     cd "${TESTPLANDIR}"
     TEARDOWN="${TESTPLANDIR}/teardown.sh"
-    if [[ -f "${TEARDOWN}" ]]; then
+    if [ -f "${TEARDOWN}" ]; then
         echo "Running teardown script ${TEARDOWN}"
         source_safely "${TEARDOWN}"
     fi
+    # TODO: do something with the output
     exit $rc
 }
 # ensure that teardown and other finalizing steps are always executed
@@ -157,6 +69,52 @@ function docker_stats {
     echo
 }
 
+# save current set options
+function save_set {
+    RUN_CSIT_SAVE_SET="$-"
+    RUN_CSIT_SHELLOPTS="$SHELLOPTS"
+}
+
+# load the saved set options
+function load_set {
+    _setopts="$-"
+
+    # bash shellopts
+    for i in $(echo "$SHELLOPTS" | tr ':' ' ') ; do
+        set +o ${i}
+    done
+    for i in $(echo "$RUN_CSIT_SHELLOPTS" | tr ':' ' ') ; do
+        set -o ${i}
+    done
+
+    # other options
+    for i in $(echo "$_setopts" | sed 's/./& /g') ; do
+        set +${i}
+    done
+    set -${RUN_CSIT_SAVE_SET}
+}
+
+# set options for quick bailout when error
+function harden_set {
+    set -xeo pipefail
+    set +u # enabled it would probably fail too many often
+}
+
+# relax set options so the sourced file will not fail
+# the responsibility is shifted to the sourced file...
+function relax_set {
+    set +e
+    set +o pipefail
+}
+
+# wrapper for sourcing a file
+function source_safely {
+    [ -z "$1" ] && return 1
+    relax_set
+    . "$1"
+    load_set
+}
+
 #
 # main
 #
@@ -164,21 +122,29 @@ function docker_stats {
 # set and save options for quick failure
 harden_set && save_set
 
-if [[ -z "${WORKSPACE}" ]]; then
-    if (git rev-parse --show-toplevel > /dev/null 2>&1); then
-        WORKSPACE=$(git rev-parse --show-toplevel)
-        export WORKSPACE
-    else
-        WORKSPACE=$(pwd)
-        export WORKSPACE
-    fi
+if [ $# -eq 0 ]; then
+    echo
+    echo "Usage: $0 plans/<project>/<functionality> [<robot-options>]"
+    echo
+    echo "    <project>, <functionality>, <robot-options>:  "
+    echo "        The same values as for the '{project}-csit-{functionality}' JJB job template."
+    echo
+    exit 1
+fi
+
+if [ -z "$WORKSPACE" ]; then
+    export WORKSPACE=$(git rev-parse --show-toplevel)
 fi
 
-if [[ ! -f "${WORKSPACE}/${TESTPLAN}/testplan.txt" ]]; then
+if [ -f "${WORKSPACE}/${1}/testplan.txt" ]; then
+    export TESTPLAN="${1}"
+else
     echo "testplan not found: ${WORKSPACE}/${TESTPLAN}/testplan.txt"
     exit 2
 fi
 
+export TESTOPTIONS="${2}"
+
 rm -rf "$WORKSPACE/archives/$TESTPLAN"
 mkdir -p "$WORKSPACE/archives/$TESTPLAN"
 
@@ -190,6 +156,7 @@ source_safely "${WORKSPACE}/prepare-csit.sh"
 # Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
 source_safely "${ROBOT3_VENV}/bin/activate"
 
+WORKDIR=$(mktemp -d --suffix=-robot-workdir)
 cd "${WORKDIR}"
 
 # Add csit scripts to PATH
@@ -219,16 +186,16 @@ grep -E -v '(^[[:space:]]*#|^[[:space:]]*$)' "${TESTPLANDIR}/testplan.txt" |\
 cat testplan.txt
 SUITES=$( xargs -a testplan.txt )
 
-echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
-echo "Starting Robot test suites ${SUITES} ..."
-relax_set
-
 echo "Versioning information:"
 python3 --version
-pip freeze
+pip3 freeze
 python3 -m robot.run --version || :
 
-python -m robot.run -N "${TESTPLAN}" -v WORKSPACE:/tmp "${ROBOT_VARIABLES}" "${TESTOPTIONS}" "${SUITES}"
+echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
+echo "Starting Robot test suites ${SUITES} ..."
+relax_set
+# Do NOT quote variables below, it breaks testing
+python3 -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
 RESULT=$?
 load_set
 echo "RESULT: $RESULT"
diff --git a/jjb/integration/simulators/integration-onap-components-simulators.yaml b/jjb/integration/simulators/integration-onap-components-simulators.yaml
new file mode 100644 (file)
index 0000000..7c1f818
--- /dev/null
@@ -0,0 +1,85 @@
+- project:
+    name: 'integration-onap-components-simulators-docker'
+    jobs:
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-aai'
+          docker-root: ./mock-aai
+          docker-name: 'onap/onap-component-mock-aai'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-aai'
+          docker-root: ./mock-aai
+          docker-name: 'onap/onap-component-mock-aai'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-cds'
+          docker-root: ./mock-cds
+          docker-name: 'onap/onap-component-mock-cds'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-cds'
+          docker-root: ./mock-cds
+          docker-name: 'onap/onap-component-mock-cds'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-clamp'
+          docker-root: ./mock-clamp
+          docker-name: 'onap/onap-component-mock-clamp'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-clamp'
+          docker-root: ./mock-clamp
+          docker-name: 'onap/onap-component-mock-clamp'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-dmaap'
+          docker-root: ./mock-dmaap
+          docker-name: 'onap/onap-component-mock-dmaap'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-dmaap'
+          docker-root: ./mock-dmaap
+          docker-name: 'onap/onap-component-mock-dmaap'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-msb-k8s'
+          docker-root: ./mock-msb-k8s
+          docker-name: 'onap/onap-component-mock-k8s'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-msb-k8s'
+          docker-root: ./mock-msb-k8s
+          docker-name: 'onap/onap-component-mock-k8s'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-sdc'
+          docker-root: ./mock-sdc
+          docker-name: 'onap/onap-component-mock-sdc'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-sdc'
+          docker-root: ./mock-sdc
+          docker-name: 'onap/onap-component-mock-sdc'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-sdnc'
+          docker-root: ./mock-sdnc
+          docker-name: 'onap/onap-component-mock-sdnc'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-sdnc'
+          docker-root: ./mock-sdnc
+          docker-name: 'onap/onap-component-mock-sdnc'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-so'
+          docker-root: ./mock-so
+          docker-name: 'onap/onap-component-mock-so'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-so'
+          docker-root: ./mock-so
+          docker-name: 'onap/onap-component-mock-so'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-ves'
+          docker-root: ./mock-ves
+          docker-name: 'onap/onap-component-mock-ves'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-ves'
+          docker-root: ./mock-ves
+          docker-name: 'onap/onap-component-mock-ves'
+    project: 'integration/onap-component-simulators'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'integration-settings'
+    build-node: ubuntu1804-docker-8c-8g
+    cron: '@daily'
+    container-tag-method: stream
\ No newline at end of file
index e260745..ba4c331 100644 (file)
@@ -35,7 +35,7 @@
       name: integration-simulators-nf-simulator-info
       jobs:
           - gerrit-info-yaml-verify
-      build-node: centos7-builder-2c-1g
+      build-node: centos8-builder-2c-1g
       project: 'integration/simulators/nf-simulator'
       project-name: 'integration-simulators-nf-simulator'
       branch: 'master'
index a36665b..75e5a02 100644 (file)
@@ -60,6 +60,6 @@
       name: integration-simulators-nf-simulator-ves-client-info
       project: integration/simulators/nf-simulator/ves-client
       project-name: integration-simulators-nf-simulator-ves-client
-      build-node: centos7-builder-2c-1g
+      build-node: centos8-builder-2c-1g
       jobs:
           - gerrit-info-yaml-verify
index f61a878..bab397e 100644 (file)
@@ -3,7 +3,7 @@
     name: integration-usecases-A1-policy-enforcement-r-apps-info
     project: integration/usecases/A1-policy-enforcement-r-apps
     project-name: integration-usecases-A1-policy-enforcement-r-apps
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 13659e6..d7f43cd 100644 (file)
@@ -4,7 +4,7 @@
     name: integration-usecases-A1-policy-enforcement-info
     project: integration/usecases/A1-policy-enforcement
     project-name: integration-usecases-A1-policy-enforcement
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 67be689..8d9e058 100644 (file)
@@ -4,7 +4,7 @@
     project-name: integration-xtesting
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: integration/xtesting
     branch: master
 
index 6f496d5..4bd142b 100644 (file)
@@ -4,6 +4,6 @@
     project-name: sandbox-3
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sandbox-3
     branch: master
index 3ca61db..548a28c 100644 (file)
@@ -67,6 +67,6 @@
     project-name: modeling-etsicatalog
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: modeling/etsicatalog
     branch: master
index 1cae6b7..8a0b3d6 100644 (file)
@@ -4,6 +4,6 @@
     project-name: modeling-modelspec
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: modeling/modelspec
     branch: master
index 0eb834a..c7b6db3 100644 (file)
@@ -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
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
@@ -84,6 +84,6 @@
     project-name: msb-apigateway
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: msb/apigateway
     branch: master
index 3764b2c..e1de868 100644 (file)
@@ -7,7 +7,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
@@ -77,6 +77,6 @@
     project-name: msb-discovery
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: msb/discovery
     branch: master
index 15aa9a0..dd7bc75 100644 (file)
@@ -7,7 +7,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: 'msb/java-sdk'
     stream:
@@ -50,6 +50,6 @@
     project-name: msb-java-sdk
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: msb/java-sdk
     branch: master
index fbd5009..f4815e9 100644 (file)
@@ -7,7 +7,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: 'msb/swagger-sdk'
     stream:
@@ -50,6 +50,6 @@
     project-name: msb-swagger-sdk
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: msb/swagger-sdk
     branch: master
index 56f8da1..8ef2bcb 100644 (file)
@@ -18,7 +18,7 @@
     jobs:
       - 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
index cec2f67..ffb58ae 100644 (file)
@@ -3,6 +3,6 @@
     project-name: multicloud-framework
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/framework
     branch: master
index c1aa85e..9519ea6 100644 (file)
@@ -5,7 +5,7 @@
     project-name: multicloud
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud
     branch: master
 
@@ -14,7 +14,7 @@
     project-name: multicloud-windriver
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/openstack/windriver
     branch: master
 
@@ -23,7 +23,7 @@
     project-name: multicloud-oom
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/oom
     branch: master
 
@@ -32,6 +32,6 @@
     project-name: multicloud-k8s
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/k8s
     branch: master
index 6b05bec..1b59ff8 100644 (file)
@@ -14,7 +14,7 @@
     jobs:
       - 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
@@ -93,7 +93,7 @@
     project-name: multicloud-openstack-vmware
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/openstack/vmware
     branch: master
     disabled: true
index e13705c..4d83ed2 100644 (file)
       - '{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
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true
@@ -73,7 +73,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'centos8-builder-4c-4g'
 
 #- project:
 #    name: multicloud-openstack-arm64
     project-name: multicloud-openstack
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/openstack
     branch: master
index 0985d66..adf8b3a 100644 (file)
@@ -24,6 +24,6 @@
     project-name: music-distributed-kv-store
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: music/distributed-kv-store
     branch: master
index aaac0b4..23af12c 100644 (file)
@@ -11,7 +11,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-version-plugin: true
           mvn-pom: 'jar/pom.xml'
           mvn-params: '-f jar/pom.xml'
index f694051..7a5f037 100644 (file)
@@ -9,6 +9,6 @@
     name: oom-platform-cert-manager-info
     project: oom/platform/cert-manager
     project-name: oom-platform-cert-manager
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
index a2f54f3..55ea68b 100644 (file)
@@ -9,7 +9,7 @@
     name: oom-platform-cert-service-info
     project: oom/platform/cert-service
     project-name: oom-platform-cert-service
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 477d66e..fe55f15 100644 (file)
@@ -9,6 +9,6 @@
     name: oom-utils-info
     project: oom/utils
     project-name: oom-utils
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
index be47867..3ce7466 100644 (file)
@@ -20,7 +20,7 @@
     project-name: offline-installer
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oom/offline-installer
     branch: master
 
index 4b7ec30..caff95b 100644 (file)
@@ -9,7 +9,7 @@
     name: oom-consul-info
     project: oom/consul
     project-name: oom-consul
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 8defb44..52cdd85 100644 (file)
@@ -53,6 +53,6 @@
     project-name: oomconfig
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oom
     branch: master
index de93089..d88533e 100644 (file)
@@ -4,7 +4,7 @@
     project-name: oom-readiness
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oom/readiness
     branch: master
 
index 93fabe7..0b0ecaa 100644 (file)
@@ -7,7 +7,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}-release-version-java-daily'
       - gerrit-maven-docker-stage:
@@ -43,6 +43,6 @@
     project-name: oom-registrator
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oom/registrator
     branch: master
index 513b73c..c4434f7 100644 (file)
@@ -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}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -45,6 +45,6 @@
     project-name: oparent
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oparent
     branch: master
index a342bcd..4616a57 100644 (file)
@@ -72,6 +72,6 @@
     project-name: optf-has
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: optf/has
     branch: master
index 64d7db4..e57a5ea 100644 (file)
@@ -73,6 +73,6 @@
     project-name: optf-osdf
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: optf/osdf
     branch: master
index 290e674..af713bd 100644 (file)
@@ -16,7 +16,7 @@
          mvn-params: "-P docker"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -82,6 +82,6 @@
     project-name: policy-apex-pdp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/apex-pdp
     branch: master
index fc2287d..85e765b 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-api
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/api
     branch: master
index ad5641f..36fec99 100644 (file)
@@ -78,6 +78,6 @@
     project-name: policy-clamp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/clamp
     branch: master
index bb9b1d4..b488b1f 100644 (file)
@@ -7,7 +7,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
           mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-gerrit-release-jobs':
@@ -67,6 +67,6 @@
     project-name: policy-common
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/common
     branch: master
index 9edde3d..4a0736d 100644 (file)
@@ -28,8 +28,6 @@
     jobs:
       - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-{functionality}'
     project-name: 'policy-xacml-pdp'
     recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     project: 'policy/docker'
@@ -80,8 +78,6 @@
     jobs:
       - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-{functionality}'
     project-name: 'policy-drools-pdp'
     recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     project: 'policy/docker'
     jobs:
       - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-{functionality}'
     project-name: 'policy-apex-pdp'
     recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
     project: 'policy/docker'
     jobs:
       - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-{functionality}'
     project-name: 'policy-pap'
     recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     project: 'policy/docker'
     jobs:
       - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-{functionality}'
     project-name: 'policy-api'
     recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     project: 'policy/docker'
     jobs:
       - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-k8s-csit-{functionality}'
     project-name: 'policy-clamp'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech ajith.sreekumar@est.tech pd1248@att.com'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
     project: 'policy/docker'
     stream:
       - 'master':
index 3a6d3b9..ef6f3fc 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-distribution
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/distribution
     branch: master
index 5626e58..e37c0e9 100644 (file)
@@ -59,6 +59,6 @@
     project-name: policy-docker
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/docker
     branch: master
index dfad61b..7a49954 100644 (file)
@@ -10,7 +10,7 @@
           mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -86,6 +86,6 @@
     project-name: policy-drools-applications
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/drools-applications
     branch: master
index 4b630c9..76ee7af 100644 (file)
@@ -10,7 +10,7 @@
           mvn-params: "-P docker"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -77,6 +77,6 @@
     project-name: policy-drools-pdp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/drools-pdp
     branch: master
index 2c50abb..f6843f6 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -75,6 +75,6 @@
     project-name: policy-gui
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/gui
     branch: master
diff --git a/jjb/policy/policy-k8s-csit.yaml b/jjb/policy/policy-k8s-csit.yaml
new file mode 100644 (file)
index 0000000..e02b6c2
--- /dev/null
@@ -0,0 +1,101 @@
+- project:
+      name: policy-xacml-pdp-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-xacml-pdp'
+      recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'xacml-pdp'
+      trigger_jobs:
+          - 'policy-xacml-pdp-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-drools-pdp-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-drools-pdp'
+      recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'drools-pdp'
+      trigger_jobs:
+          - 'policy-drools-pdp-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-apex-pdp-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-apex-pdp'
+      recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'apex-pdp'
+      trigger_jobs:
+          - 'policy-apex-pdp-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-pap-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-pap'
+      recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'pap'
+      trigger_jobs:
+          - 'policy-pap-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-api-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-api'
+      recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'api'
+      trigger_jobs:
+          - 'policy-api-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-clamp-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-clamp'
+      recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'clamp'
+      trigger_jobs:
+          - 'policy-clamp-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
index e3cbf3a..9831f14 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-models
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/models
     branch: master
index 257f6ef..092b6ab 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-pap
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/pap
     branch: master
index 12929be..3df4a95 100644 (file)
@@ -7,7 +7,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
           mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-gerrit-release-jobs':
@@ -49,6 +49,6 @@
     project-name: policy-parent
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/parent
     branch: master
index 288afe6..0d2e581 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-xacml-pdp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/xacml-pdp
     branch: master
diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml
new file mode 100644 (file)
index 0000000..b711bb4
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- project:
+    name: portal-ng-history-project-view
+    project-name: portal-ng-history
+    views:
+      - project-view
+
+- project:
+    name: portal-ng-history-info
+    project: portal-ng/history
+    project-name: portal-ng-history
+    build-node: centos8-builder-2c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file
diff --git a/jjb/portal-ng/portal-ng-ui.yaml b/jjb/portal-ng/portal-ng-ui.yaml
new file mode 100644 (file)
index 0000000..784800e
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- project:
+    name: portal-ng-ui-project-view
+    project-name: portal-ng-ui
+    views:
+      - project-view
+
+- project:
+    name: portal-ng-ui-info
+    project: portal-ng/ui
+    project-name: portal-ng-ui
+    build-node: centos8-builder-2c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file
index 94ba547..9bd1971 100644 (file)
@@ -9,6 +9,6 @@
     name: relman-info
     project: relman
     project-name: relman
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
index eb0d11a..2715743 100644 (file)
@@ -16,7 +16,7 @@
     default-version: latest
     tox-dir: "docs/"
     doc-dir: "_build/html"
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     # the jjb is very short and filtering docs falsy raises side effects in
     # ONAP doc
     gerrit_trigger_file_paths:
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
deleted file mode 100644 (file)
index 3798685..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-
-- project:
-    name: sdc-sdc-docker-base
-    project-name: 'sdc-sdc-docker-base'
-    jobs:
-      - '{project-name}-{stream}-verify-java':
-          build-node: 'ubuntu1804-docker-v1-8c-8g'
-          docker-pom: 'pom.xml'
-      - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'default'
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P default'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'sdc/sdc-docker-base'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'sdc-sdc-docker-base-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn36'
-
-- project:
-    name: sdc-sdc-docker-base-info
-    project-name: sdc-sdc-docker-base
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/sdc-docker-base
-    branch: master
index ea3db29..663656b 100644 (file)
     mvn-settings: 'so-adapters-so-cnf-adapter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: so-adapters-so-cnf-adapter-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'so/adapters/so-cnf-adapter'
+    project-name: 'so-adapters-so-cnf-adapter'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'so-adapters-so-cnf-adapter-settings'
index a3f64f8..f1578f2 100644 (file)
@@ -9,7 +9,7 @@
     name: so-adapters-so-etsi-sol003-adapter-info
     project: so/adapters/so-etsi-sol003-adapter
     project-name: so-adapters-so-etsi-sol003-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -21,7 +21,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-v1-8c-8g
index cb16d5c..f90c894 100644 (file)
@@ -9,7 +9,7 @@
     name: so-adapters-so-etsi-sol005-adapter-info
     project: so/adapters/so-etsi-sol005-adapter
     project-name: so-adapters-so-etsi-sol005-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -21,7 +21,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-v1-8c-8g
     mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
+- project:
+    name: so-adapters-so-etsi-sol005-adapter-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'so/adapters/so-etsi-sol005-adapter'
+    project-name: 'so-adapters-so-etsi-sol005-adapter'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
index 6b14d6a..6e51b8b 100644 (file)
@@ -9,7 +9,7 @@
     name: so-adapters-so-nssmf-adapter-info
     project: so/adapters/so-nssmf-adapter
     project-name: so-adapters-so-nssmf-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -21,7 +21,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-v1-8c-8g
index 5a37cf6..c59c8ba 100644 (file)
@@ -9,7 +9,7 @@
     name: so-adapters-so-oof-adapter-info
     project: so/adapters/so-oof-adapter
     project-name: so-adapters-so-oof-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -21,7 +21,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-v1-8c-8g
     mvn-settings: 'so-adapters-so-oof-adapter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: so-adapters-so-oof-adapter-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'so/adapters/so-oof-adapter'
+    project-name: 'so-adapters-so-oof-adapter'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'so-adapters-so-oof-adapter-settings'
index 94cb8a2..c6f2e8a 100644 (file)
@@ -7,7 +7,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}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -62,6 +62,6 @@
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: so/libs
     branch: master
index 0c268a5..810b739 100644 (file)
@@ -9,7 +9,7 @@
     name: so-so-admin-cockpit-info
     project: so/so-admin-cockpit
     project-name: so-so-admin-cockpit
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -21,7 +21,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-v1-8c-8g
index 3d5a2f5..40796c8 100644 (file)
@@ -9,7 +9,7 @@
     name: so-so-etsi-nfvo-info
     project: so/so-etsi-nfvo
     project-name: so-so-etsi-nfvo
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -21,7 +21,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-v1-8c-8g
index cae9480..7f3c1aa 100644 (file)
@@ -14,7 +14,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-v1-8c-8g
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: so
     stream:
       - 'master':
index b1b3f54..269b5cb 100644 (file)
@@ -4,7 +4,7 @@
     project-name: testsuite-pythonsdk-tests
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: testsuite/pythonsdk-tests
     branch: master
 
index 7a4ad4d..ea463b6 100644 (file)
@@ -9,6 +9,6 @@
     name: testsuite-robot-utils-info
     project: testsuite/robot-utils
     project-name: testsuite-robot-utils
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
index 65c818c..7542c2b 100644 (file)
@@ -9,7 +9,7 @@
     name: testsuite-cds-mock-odl-info
     project: testsuite/cds-mock-odl
     project-name: testsuite-cds-mock-odl
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index c6bc7a3..62f712f 100644 (file)
@@ -9,7 +9,7 @@
     name: testsuite-cds-mock-server-info
     project: testsuite/cds-mock-server
     project-name: testsuite-cds-mock-server
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 9fad20f..4c0ece3 100644 (file)
@@ -9,7 +9,7 @@
     name: testsuite-cds-mock-ssh-info
     project: testsuite/cds-mock-ssh
     project-name: testsuite-cds-mock-ssh
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 2fef96a..77b4606 100644 (file)
@@ -3,7 +3,7 @@
     name: testsuite-cds-info
     project: testsuite/cds
     project-name: testsuite-cds
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 40b281a..14ce6e4 100644 (file)
@@ -4,7 +4,7 @@
     project-name: testsuite-oom
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: testsuite/oom
     branch: master
 
index bc62ee4..db3e730 100644 (file)
@@ -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
 
index 04095f2..92cc787 100644 (file)
@@ -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
index 0ea30f0..ef52d2c 100644 (file)
@@ -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
 
index 7933e36..86dfa30 100644 (file)
@@ -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
index 2c95ecf..518f73e 100644 (file)
@@ -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
index e797c3f..4fc3df1 100644 (file)
@@ -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
index 1904813..5df66c4 100644 (file)
@@ -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
index 798f9fc..54509ea 100644 (file)
@@ -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
index 679cc45..258ae31 100644 (file)
@@ -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
index 00d2d23..5d975c4 100644 (file)
@@ -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
index 2129883..e779697 100644 (file)
@@ -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
index add2502..24f98c1 100644 (file)
@@ -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
index f38f4d8..e86a691 100644 (file)
@@ -10,7 +10,7 @@
     project: 'vnfrqts/epics'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-epics'
     branch: 'master'
     mvn-settings: 'vnfrqts-epics-settings'
index dbd30a7..6517277 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfrqts/guidelines'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-guidelines'
     branch: 'master'
     mvn-settings: 'vnfrqts-guidelines-settings'
index e026fb4..a8fd39c 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfrqts/requirements'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-requirements'
     branch: 'master'
     mvn-settings: 'vnfrqts-requirements-settings'
index a06e7ed..13dcfe8 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfrqts/testcases'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-testcases'
     branch: 'master'
     mvn-settings: 'vnfrqts-testcases-settings'
index 5070867..8d964c6 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfrqts/usecases'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-usecases'
     branch: 'master'
     mvn-settings: 'vnfrqts-usecases-settings'
index abeee9a..77ef5e7 100644 (file)
@@ -68,7 +68,7 @@
     name: vnfsdk-dovetail-integration-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
index 2e2cfad..1b2dedd 100644 (file)
@@ -7,7 +7,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: 'vnfsdk/functest'
@@ -23,7 +23,7 @@
     name: vnfsdk-functest-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
index e2e365c..c1f2408 100644 (file)
@@ -15,7 +15,7 @@
     name: vnfsdk-lctest-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/lctest'
     project-name: 'vnfsdk-lctest'
     branch: 'master'
index 90763d2..5ef1b67 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfsdk/model'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: vnfsdk-model
     branch: master
     mvn-settings: vnfsdk-model-settings
index 6d22310..c39e25f 100644 (file)
@@ -37,7 +37,7 @@
     name: vnfsdk-pkgtools-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/pkgtools'
     project-name: 'vnfsdk-pkgtools'
     branch: 'master'
index 615b4c3..b10c146 100644 (file)
@@ -7,10 +7,10 @@
       - '{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: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-goals: 'clean package -Pdocker'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -49,7 +49,7 @@
     name: vnfsdk-refrepo-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
@@ -79,7 +79,7 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
index 8f23c6e..54cee4a 100644 (file)
@@ -7,7 +7,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}-gerrit-release-jobs':
         build-node: centos7-docker-8c-8g
@@ -43,7 +43,7 @@
     name: vnfsdk-validation-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
@@ -88,7 +88,7 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
index b0516ce..a57ee42 100644 (file)
@@ -7,4 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
index a0870ad..f30f0d4 100644 (file)
@@ -7,4 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
index 2a6b271..3c24427 100644 (file)
@@ -7,4 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
index bea93c3..0de82d8 100644 (file)
@@ -7,4 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
index cdf752a..ac824ce 100644 (file)
@@ -42,9 +42,7 @@
   "provisioners": [
     {
       "type": "shell",
-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
@@ -53,6 +51,8 @@
     },
     {
       "type": "ansible",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "playbook_file": "provision/helm.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
index 6bf7b17..657f109 100644 (file)
@@ -39,9 +39,7 @@
   "provisioners": [
     {
       "type": "shell",
-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
@@ -50,6 +48,8 @@
     },
     {
       "type": "ansible",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "playbook_file": "provision/redis.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",