Merge "Chore: Automation adds aiml-fw/aihp/tps/kserve-adapter config files"

diff --git a/global-jjb b/global-jjb
index abb522a..1d572dc 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit abb522a78975595e92197da01d72fbd2a1175085
+Subproject commit 1d572dc0110bdd1d9881fa6b4f2d60d43b6138da

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/config-params.yaml
new file mode 100644 (file)
index 0000000..f9c3373
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "aiml-fw-athp-data-extraction"
+comment: "aiml-fw-athp-data-extraction"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/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-data-extraction/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/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-data-extraction/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..1e9edf1
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "releases"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "snapshots"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "staging"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "site"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "nexus3.o-ran-sc.org:10001"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "nexus3.o-ran-sc.org:10002"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "nexus3.o-ran-sc.org:10003"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "nexus3.o-ran-sc.org:10004"
+    credentialsId: "aiml-fw-athp-data-extraction"
\ 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 (file)
index 0000000..bb3fc05
--- /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 (symlink)
index 0000000..e830ebd
--- /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 (symlink)
index 0000000..8f92057
--- /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 (file)
index 0000000..b8e02d2
--- /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/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 (file)
index 0000000..81ca616
--- /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 (symlink)
index 0000000..e830ebd
--- /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 (symlink)
index 0000000..d7baae2
--- /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 (file)
index 0000000..5813aff
--- /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-awmf-tm/aiml-fw-awmf-tm.yaml b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
new file mode 100644 (file)
index 0000000..8a93a48
--- /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/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml
index cec36e4..ae26de1 100644 (file)
--- 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 1d644f8..e6ed20f 100644 (file)
--- 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-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 602ee42..d46b50f 100644 (file)
--- 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 63402d2..b0a111d 100644 (file)
--- 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 6e70930..f512695 100644 (file)
--- 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-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
index b995a3f..53eeff0 100644 (file)
--- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
+++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
@@ -84,7 +84,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 +95,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/sonar-project.properties b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties
index 253b108..1c0543c 100644 (file)
--- 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 36f8b51..d2df8a1 100644 (file)
--- 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-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index f19d1f3..1c9b831 100644 (file)
--- 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