From: Eric Ball Date: Wed, 12 Oct 2022 15:40:05 +0000 (+0000) Subject: Merge "Chore: Automation adds aiml-fw/athp/data-extraction config files" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=69687a07d6ebd2adc7dbd9fdd13232a0b9b59707;hp=3997d399d4536ff5c281c8cea6208f95bcf4b446;p=ci-management.git Merge "Chore: Automation adds aiml-fw/athp/data-extraction config files" --- diff --git a/global-jjb b/global-jjb index a09b8bab..e2c560aa 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit a09b8bab2c37f67f0f5e9ef36f9e93b330fdd571 +Subproject commit e2c560aa754635dee7b536ef4e96cc00b723107f diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg index e397b830..82f2a7df 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-builder-1c-1g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210930-234326.587 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220920-131540.754 HARDWARE_ID=v2-highcpu-1 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg index 23bda504..ad15aa3a 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-docker-2c-8g-200g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20210930-234402.929 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220920-131539.732 HARDWARE_ID=v2-standard-2 VOLUME_SIZE=200 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg index 06e9e36a..eea581b3 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-docker-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20210930-234402.929 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220920-131539.732 HARDWARE_ID=v2-standard-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 2b8d75e0..c703e264 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=sjc1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210930-234326.587 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220920-131540.754 VOLUME_SIZE=20 HARDWARE_ID=v2-highcpu-1 NETWORK_ID=b9e029b4-9b35-4a83-a4e6-c820eb00c3ec diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg index c6edac7d..8a6a635d 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-builder-2c-2g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220920-114402.749 HARDWARE_ID=v2-highcpu-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index d3310896..17f89066 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-builder-4c-4g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220920-114402.749 HARDWARE_ID=v2-highcpu-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg index dfe35b9a..1cd6177e 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-docker-4c-4g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211006-230325.518 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220920-113903.122 HARDWARE_ID=v2-highcpu-4 VOLUME_SIZE=20 diff --git a/jenkins-config/managed-config-files/custom/pipconf/content b/jenkins-config/managed-config-files/custom/pipconf/content index 8b137891..6581d0e0 100644 --- a/jenkins-config/managed-config-files/custom/pipconf/content +++ b/jenkins-config/managed-config-files/custom/pipconf/content @@ -1 +1,3 @@ - +[global] +timeout = 60 +index-url = https://nexus3.o-ran-sc.org/repository/PyPi/simple diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/config-params.yaml new file mode 100644 index 00000000..b029ec67 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "aiml-fw-aihp-tps-kserve-adapter" +comment: "aiml-fw-aihp-tps-kserve-adapter" \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/content new file mode 120000 index 00000000..e830ebdd --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.sandbox.yaml new file mode 120000 index 00000000..8f920579 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.sandbox.yaml @@ -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/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.yaml new file mode 100644 index 00000000..300e05ab --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - serverId: "releases" + credentialsId: "aiml-fw-aihp-tps-kserve-adapter" + - serverId: "snapshots" + credentialsId: "aiml-fw-aihp-tps-kserve-adapter" + - serverId: "staging" + credentialsId: "aiml-fw-aihp-tps-kserve-adapter" + - serverId: "site" + credentialsId: "aiml-fw-aihp-tps-kserve-adapter" + - serverId: "nexus3.o-ran-sc.org:10001" + credentialsId: "aiml-fw-aihp-tps-kserve-adapter" + - serverId: "nexus3.o-ran-sc.org:10002" + credentialsId: "aiml-fw-aihp-tps-kserve-adapter" + - serverId: "nexus3.o-ran-sc.org:10003" + credentialsId: "aiml-fw-aihp-tps-kserve-adapter" + - serverId: "nexus3.o-ran-sc.org:10004" + credentialsId: "aiml-fw-aihp-tps-kserve-adapter" \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/config-params.yaml new file mode 100644 index 00000000..8635abf4 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "aiml-fw-athp-tps-kubeflow-adapter" +comment: "aiml-fw-athp-tps-kubeflow-adapter" \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/content new file mode 120000 index 00000000..e830ebdd --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.sandbox.yaml new file mode 120000 index 00000000..8f920579 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.sandbox.yaml @@ -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/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.yaml new file mode 100644 index 00000000..dffdc891 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-tps-kubeflow-adapter/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - serverId: "releases" + credentialsId: "aiml-fw-athp-tps-kubeflow-adapter" + - serverId: "snapshots" + credentialsId: "aiml-fw-athp-tps-kubeflow-adapter" + - serverId: "staging" + credentialsId: "aiml-fw-athp-tps-kubeflow-adapter" + - serverId: "site" + credentialsId: "aiml-fw-athp-tps-kubeflow-adapter" + - serverId: "nexus3.o-ran-sc.org:10001" + credentialsId: "aiml-fw-athp-tps-kubeflow-adapter" + - serverId: "nexus3.o-ran-sc.org:10002" + credentialsId: "aiml-fw-athp-tps-kubeflow-adapter" + - serverId: "nexus3.o-ran-sc.org:10003" + credentialsId: "aiml-fw-athp-tps-kubeflow-adapter" + - serverId: "nexus3.o-ran-sc.org:10004" + credentialsId: "aiml-fw-athp-tps-kubeflow-adapter" \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/config-params.yaml new file mode 100644 index 00000000..bb3fc057 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "aiml-fw-awmf-tm" +comment: "aiml-fw-awmf-tm" \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/content new file mode 120000 index 00000000..e830ebdd --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.sandbox.yaml new file mode 120000 index 00000000..8f920579 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.sandbox.yaml @@ -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/aiml-fw-awmf-tm/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.yaml new file mode 100644 index 00000000..b8e02d26 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-tm/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - serverId: "releases" + credentialsId: "aiml-fw-awmf-tm" + - serverId: "snapshots" + credentialsId: "aiml-fw-awmf-tm" + - serverId: "staging" + credentialsId: "aiml-fw-awmf-tm" + - serverId: "site" + credentialsId: "aiml-fw-awmf-tm" + - serverId: "nexus3.o-ran-sc.org:10001" + credentialsId: "aiml-fw-awmf-tm" + - serverId: "nexus3.o-ran-sc.org:10002" + credentialsId: "aiml-fw-awmf-tm" + - serverId: "nexus3.o-ran-sc.org:10003" + credentialsId: "aiml-fw-awmf-tm" + - serverId: "nexus3.o-ran-sc.org:10004" + credentialsId: "aiml-fw-awmf-tm" \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/config-params.yaml new file mode 100644 index 00000000..26cc1a5b --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "portal-aiml-dashboard" +comment: "portal-aiml-dashboard" \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/content b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/content new file mode 120000 index 00000000..e830ebdd --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.sandbox.yaml new file mode 120000 index 00000000..8f920579 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.sandbox.yaml @@ -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-aiml-dashboard/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.yaml new file mode 100644 index 00000000..6f85f16f --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/portal-aiml-dashboard/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - serverId: "releases" + credentialsId: "portal-aiml-dashboard" + - serverId: "snapshots" + credentialsId: "portal-aiml-dashboard" + - serverId: "staging" + credentialsId: "portal-aiml-dashboard" + - serverId: "site" + credentialsId: "portal-aiml-dashboard" + - serverId: "nexus3.o-ran-sc.org:10001" + credentialsId: "portal-aiml-dashboard" + - serverId: "nexus3.o-ran-sc.org:10002" + credentialsId: "portal-aiml-dashboard" + - serverId: "nexus3.o-ran-sc.org:10003" + credentialsId: "portal-aiml-dashboard" + - serverId: "nexus3.o-ran-sc.org:10004" + credentialsId: "portal-aiml-dashboard" \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/config-params.yaml new file mode 100644 index 00000000..81ca616a --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "ric-plt-ricdms-settings" +comment: "ric-plt-ricdms-settings" diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/content b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/content new file mode 120000 index 00000000..e830ebdd --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.sandbox.yaml new file mode 120000 index 00000000..d7baae2f --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.sandbox.yaml @@ -0,0 +1 @@ +../../../managed-config-templates/serverCredentialMappings.sandbox.yaml \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.yaml new file mode 100644 index 00000000..5813affd --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - credentialsId: "ric-plt-ricdms" + serverId: "releases" + - credentialsId: "ric-plt-ricdms" + serverId: "staging" + - credentialsId: "ric-plt-ricdms" + serverId: "site" + - credentialsId: "ric-plt-ricdms" + serverId: "snapshots" + - credentialsId: "ric-plt-ricdms" + serverId: "nexus3.o-ran-sc.org:10001" + - credentialsId: "ric-plt-ricdms" + serverId: "nexus3.o-ran-sc.org:10002" + - credentialsId: "ric-plt-ricdms" + serverId: "nexus3.o-ran-sc.org:10003" + - credentialsId: "ric-plt-ricdms" + serverId: "nexus3.o-ran-sc.org:10004" diff --git a/jjb/aiml-fw-aihp-tps-kserve-adapter/aiml-fw-aihp-tps-kserve-adapter.yaml b/jjb/aiml-fw-aihp-tps-kserve-adapter/aiml-fw-aihp-tps-kserve-adapter.yaml new file mode 100644 index 00000000..118779f8 --- /dev/null +++ b/jjb/aiml-fw-aihp-tps-kserve-adapter/aiml-fw-aihp-tps-kserve-adapter.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aiml-fw-aihp-tps-kserve-adapter-project-view + project-name: aiml-fw-aihp-tps-kserve-adapter + views: + - project-view + +- project: + name: aiml-fw-aihp-tps-kserve-adapter-info + project: aiml-fw/aihp/tps/kserve-adapter + project-name: aiml-fw-aihp-tps-kserve-adapter + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify \ No newline at end of file diff --git a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml new file mode 100644 index 00000000..b59f2942 --- /dev/null +++ b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aiml-fw-athp-data-extraction-project-view + project-name: aiml-fw-athp-data-extraction + views: + - project-view + +- project: + name: aiml-fw-athp-data-extraction-info + project: aiml-fw/athp/data-extraction + project-name: aiml-fw-athp-data-extraction + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify \ No newline at end of file diff --git a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml new file mode 100644 index 00000000..a1611e85 --- /dev/null +++ b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aiml-fw-athp-tps-kubeflow-adapter-project-view + project-name: aiml-fw-athp-tps-kubeflow-adapter + views: + - project-view + +- project: + name: aiml-fw-athp-tps-kubeflow-adapter-info + project: aiml-fw/athp/tps/kubeflow-adapter + project-name: aiml-fw-athp-tps-kubeflow-adapter + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify \ No newline at end of file diff --git a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml new file mode 100644 index 00000000..8a93a48c --- /dev/null +++ b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aiml-fw-awmf-tm-project-view + project-name: aiml-fw-awmf-tm + views: + - project-view + +- project: + name: aiml-fw-awmf-tm-info + project: aiml-fw/awmf/tm + project-name: aiml-fw-awmf-tm + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify \ No newline at end of file diff --git a/jjb/aiml-fw/aiml-fw.yaml b/jjb/aiml-fw/aiml-fw.yaml new file mode 100644 index 00000000..aeb6e02f --- /dev/null +++ b/jjb/aiml-fw/aiml-fw.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aiml-fw-project-view + project-name: aiml-fw + views: + - project-view + +- project: + name: aiml-fw-info + project: aiml-fw + project-name: aiml-fw + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify \ No newline at end of file diff --git a/jjb/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml index cec36e49..ae26de1f 100644 --- a/jjb/ci-management/ci-packer.yaml +++ b/jjb/ci-management/ci-packer.yaml @@ -6,6 +6,8 @@ project: ci-management project-name: ci-management build-node: centos7-builder-1c-1g + build-timeout: 90 + cron: "00 H 1 * *" - project: name: packer-verify diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml index 1d644f85..e6ed20f4 100644 --- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml +++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml @@ -66,12 +66,12 @@ - project: <<: *dmaapadapter_jdk_common name: nonrtric-plt-dmaapadapter-sonar - project-name: '{name}' + project-name: nonrtric-plt-dmaapadapter # template goal install builds docker image unnecessarily mvn-params: '-Ddocker.skip=true' sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-dmaapadapter' + sonarcloud-project-key: 'nonrtric-plt-dmaapadapter' sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-maven-sonar diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml index 8c6bc5ab..679799d7 100644 --- a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml +++ b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml @@ -50,7 +50,6 @@ jobs: - "{project-name}-gerrit-docker-jobs" - gerrit-go-verify - - gerrit-maven-docker-stage stream: - master: branch: master diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml index 602ee421..d46b50fb 100644 --- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml +++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml @@ -66,12 +66,12 @@ - project: <<: *informationcoordinatorservice_jdk_common name: nonrtric-plt-informationcoordinatorservice-sonar - project-name: '{name}' + project-name: nonrtric-plt-informationcoordinatorservice # template goal install builds docker image unnecessarily mvn-params: '-Ddocker.skip=true' sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-informationcoordinatorservice' + sonarcloud-project-key: 'nonrtric-plt-informationcoordinatorservice' sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-maven-sonar diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml index 63402d29..b0a111d8 100644 --- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml +++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml @@ -66,12 +66,12 @@ - project: <<: *rappcatalogue_jdk_common name: nonrtric-plt-rappcatalogue-sonar - project-name: '{name}' + project-name: nonrtric-plt-rappcatalogue # template goal install builds docker image unnecessarily mvn-params: '-Ddocker.skip=true' sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric_plt_rappcatalogue' + sonarcloud-project-key: 'nonrtric_plt_rappcatalogue' sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-maven-sonar diff --git a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml index 6e70930d..f5126958 100644 --- a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml +++ b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml @@ -34,8 +34,6 @@ stream: - master: branch: master - - f-release: - branch: f-release # nonrtric:nonrtric-plt-sdnca1controller # Maven artifacts for nonrtric-plt-sdnca1controller @@ -51,8 +49,6 @@ stream: - master: branch: master - - f-release: - branch: f-release - project: <<: *sdnca1controller_jdk_common diff --git a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml index d08b3950..ed48c338 100644 --- a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml +++ b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml @@ -35,10 +35,7 @@ build-node: ubuntu1804-docker-4c-4g # Includes verify and merge jobs jobs: - - "{project-name}-gerrit-docker-jobs" + - '{project-name}-gerrit-docker-jobs' stream: - master: branch: master - - f-release: - branch: f-release - diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml index b995a3f0..2b6e8054 100644 --- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml +++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml @@ -44,7 +44,6 @@ # Includes verify and merge jobs jobs: - "{project-name}-gerrit-docker-jobs" - - gerrit-maven-docker-stage stream: - master: branch: master @@ -74,7 +73,6 @@ jobs: - "{project-name}-gerrit-docker-jobs" - gerrit-go-verify - - gerrit-maven-docker-stage stream: - master: branch: master @@ -84,7 +82,7 @@ - project: <<: *orufhrecovery_common name: nonrtric-rapp-orufhrecovery-consumer-sonar - project-name: '{name}' + project-name: 'nonrtric-rapp-orufhrecovery-consumer' # prescan script requires ubuntu # golang is only on docker-enabled nodes build-node: ubuntu1804-docker-4c-4g @@ -95,7 +93,7 @@ sonar-properties: | # Required metadata sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_nonrtric-rapp-orufhrecovery-consumer + sonar.projectKey=nonrtric-rapp-orufhrecovery-consumer sonar.organization={sonarcloud_project_organization} # Encoding sonar.build.sourceEncoding=UTF-8 diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml index 0618200e..c36a841b 100644 --- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml +++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml @@ -50,7 +50,6 @@ jobs: - "{project-name}-gerrit-docker-jobs" - gerrit-go-verify - - gerrit-maven-docker-stage stream: - master: branch: master @@ -76,7 +75,6 @@ jobs: - "{project-name}-gerrit-docker-jobs" - gerrit-go-verify - - gerrit-maven-docker-stage stream: - master: branch: master diff --git a/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties index 253b108c..1c0543c4 100644 --- a/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties +++ b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties @@ -1,6 +1,6 @@ # Required metadata sonar.login={sonarcloud_api_token} -sonar.projectKey={sonarcloud_project_organization}_{project-name} +sonar.projectKey={project-name} sonar.organization={sonarcloud_project_organization} # Encoding sonar.build.sourceEncoding=UTF-8 diff --git a/jjb/nonrtric/sonar-project.properties b/jjb/nonrtric/sonar-project.properties index 36f8b511..d2df8a1d 100644 --- a/jjb/nonrtric/sonar-project.properties +++ b/jjb/nonrtric/sonar-project.properties @@ -1,6 +1,6 @@ # Required metadata sonar.login={sonarcloud_api_token} -sonar.projectKey={sonarcloud_project_organization}_{project-name} +sonar.projectKey={project-name} sonar.organization={sonarcloud_project_organization} # Encoding sonar.build.sourceEncoding=UTF-8 diff --git a/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml b/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml new file mode 100644 index 00000000..7befb3b3 --- /dev/null +++ b/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: portal-aiml-dashboard-project-view + project-name: portal-aiml-dashboard + views: + - project-view + +- project: + name: portal-aiml-dashboard-info + project: portal/aiml-dashboard + project-name: portal-aiml-dashboard + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify \ No newline at end of file diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml index f19d1f3f..1c9b831c 100644 --- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml +++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml @@ -25,6 +25,8 @@ # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml java-version: openjdk11 mvn-version: mvn36 + sonarcloud-project-key: "portal-nonrtric-controlpanel" + sonarcloud-project-organization: "o-ran-sc" - project: <<: *portal_nonrtric_controlpanel_common @@ -66,16 +68,32 @@ - project: <<: *portal_nonrtric_controlpanel_common - name: portal-nonrtric-controlpanel-sonar + name: portal-nonrtric-controlpanel-gateway-sonar # template goal install builds docker image unnecessarily - mvn-params: -Ddocker.skip=true + mvn-params: '-Ddocker.skip=true -f nonrtric-gateway' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'nonrtric-gateway/.*' sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonarcloud-project-key: '{project-name}-gateway' sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-maven-sonar +- project: + <<: *portal_nonrtric_controlpanel_common + name: portal-nonrtric-controlpanel-frontend-sonar + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'webapp-frontend/.*' + build-node: ubuntu1804-docker-4c-4g + java-version: openjdk11 + sonarcloud: true + sonar-project-file: "" + jobs: + - gerrit-cli-sonar + - project: <<: *portal_nonrtric_controlpanel_common name: portal-nonrtric-controlpanel-gateway diff --git a/jjb/shell/install-git-pistache.sh b/jjb/shell/install-git-pistache.sh index 07c7746c..dd7812be 100755 --- a/jjb/shell/install-git-pistache.sh +++ b/jjb/shell/install-git-pistache.sh @@ -40,8 +40,8 @@ git clone https://github.com/pistacheio/pistache.git && cd pistache && meson set --prefix="$PWD/prefix" && \ meson install -C build && \ sudo cp -rf prefix/include/pistache /usr/include/pistache && \ - sudo cp prefix/lib/x86_64-linux-gnu/libpistache.so.0.0.3 $LIBRARY_PATH && \ - sudo ln -s $LIBRARY_PATH/libpistache.so.0.0.3 $LIBRARY_PATH/libpistache.so.0 && \ + sudo cp prefix/lib/x86_64-linux-gnu/libpistache.so.0.0.5 $LIBRARY_PATH && \ + sudo ln -s $LIBRARY_PATH/libpistache.so.0.0.5 $LIBRARY_PATH/libpistache.so.0 && \ sudo ln -s $LIBRARY_PATH/libpistache.so.0 $LIBRARY_PATH/libpistache.so && \ sudo ldconfig diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml index fd94438e..740bb899 100644 --- a/jjb/smo-ves/smo-ves.yaml +++ b/jjb/smo-ves/smo-ves.yaml @@ -22,6 +22,8 @@ project-name: smo-ves # maven settings file has docker credentials mvn-settings: smo-ves-settings + sonarcloud-project-key: "smo-ves" + sonarcloud-project-organization: "o-ran-sc" - project: <<: *ves_docker_common @@ -88,37 +90,7 @@ - project: <<: *ves_docker_common - name: smo-ves-collector-release - project-name: '{name}' - # maven release requires sigul which requires centos - # container release requires docker - build-node: centos7-docker-2c-8g - jobs: - - '{project-name}-gerrit-release-jobs' - -- project: - <<: *ves_docker_common - name: smo-ves-dmaap-adapter-release - project-name: '{name}' - # maven release requires sigul which requires centos - # container release requires docker - build-node: centos7-docker-2c-8g - jobs: - - '{project-name}-gerrit-release-jobs' - -- project: - <<: *ves_docker_common - name: smo-ves-influxdb-connector-release - project-name: '{name}' - # maven release requires sigul which requires centos - # container release requires docker - build-node: centos7-docker-2c-8g - jobs: - - '{project-name}-gerrit-release-jobs' - -- project: - <<: *ves_docker_common - name: smo-ves-post-config-release + name: smo-ves-release project-name: '{name}' # maven release requires sigul which requires centos # container release requires docker @@ -156,3 +128,4 @@ sonar.python.coverage.reportPaths=coverage.xml jobs: - gerrit-tox-sonar + - gerrit-cli-sonar diff --git a/packer/common-packer b/packer/common-packer index 1bbdb3b9..b8bffd62 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 1bbdb3b9477f25d71bc75862d9fb6f3aa69a924a +Subproject commit b8bffd625cbf589079fcfd9ba1a37c91fdc7f99b