Merge "Automation adds ric-app-rc.yaml"

diff --git a/global-jjb b/global-jjb
index 24d80c0..77f06cb 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 24d80c063923fc2ae4e76a5797ae471601c18569
+Subproject commit 77f06cb5e687962c7f999c80fbcf2a6b31042afd

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index f010d20..0bfaf2c 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -38,12 +38,14 @@
           branch: cherry
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
 
 # nonrtric:a1-policy-management-service/
 # Maven artifacts for nonrtric-a1-policy-management-service/
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-a1-policy-management-service/
+    name: nonrtric-a1-policy-management-service
     project-name: '{name}'
     mvn-opts: '-Ddocker.skip=true'
     mvn-params: '-f a1-policy-management-service/'
@@ -59,6 +61,27 @@
     stream:
       - master:
           branch: master
+      - e-release:
+          branch: e-release
+
+# nonrtric:policy-agent/
+# Maven artifacts for nonrtric-policy-agent/
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-policy-agent
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    mvn-params: '-f policy-agent/'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'policy-agent/.*'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
       - cherry:
           branch: cherry
       - dawn:
@@ -88,6 +111,8 @@
           branch: cherry
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
 
 # nonrtric:information-coordinator-service
 # Maven artifacts for nonrtric-information-coordinator-service
@@ -109,22 +134,20 @@
     stream:
       - master:
           branch: master
-      - cherry:
-          branch: cherry
-      - dawn:
-          branch: dawn
+      - e-release:
+          branch: e-release
 
-# nonrtric:r-app-catalogue
-# Maven artifacts for r-app-catalogue
+# nonrtric:enrichment-coordinator-service
+# Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-r-app-catalogue
+    name: nonrtric-enrichment-coordinator-service
     project-name: '{name}'
     mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f r-app-catalogue'
+    mvn-params: '-f enrichment-coordinator-service'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'r-app-catalogue/.*'
+        pattern: 'enrichment-coordinator-service/.*'
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-verify
@@ -132,62 +155,37 @@
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
-      - master:
-          branch: master
       - cherry:
           branch: cherry
       - dawn:
           branch: dawn
 
+# nonrtric:r-app-catalogue
+# Maven artifacts for r-app-catalogue
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-o-ru-closed-loop-recovery
+    name: nonrtric-r-app-catalogue
     project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery'
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
-    # Directory with Dockerfile
-    docker-root: 'test/usecases/oruclosedlooprecovery/scriptversion/app'
-    # Limit build trigger to appropriate files
+    mvn-opts: '-Ddocker.skip=true'
+    mvn-params: '-f r-app-catalogue'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
+        pattern: 'r-app-catalogue/.*'
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
-      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-maven-verify
+      - gerrit-maven-merge
+      - gerrit-maven-stage
+      - gerrit-maven-clm
     stream:
       - master:
           branch: master
+      - cherry:
+          branch: cherry
       - dawn:
           branch: dawn
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-o-ru-closed-loop-consumer
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-consumer'
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
-    # Directory with Dockerfile
-    docker-root: 'test/usecases/oruclosedlooprecovery/goversion/'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'test/usecases/oruclosedlooprecovery/goversion/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
-    jobs:
-      - "{project-name}-gerrit-docker-jobs"
-    stream:
-      - master:
-          branch: master
+      - e-release:
+          branch: e-release
 
 - project:
     <<: *nonrtric_jdk_common
@@ -220,6 +218,57 @@
     jobs:
       - gerrit-sonar-prescan-script
 
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-sonar
+    project-name: '{name}'
+    # 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'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar
+
+# Usecases
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-o-ru-closed-loop-recovery
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'test/usecases/oruclosedlooprecovery/scriptversion/app'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+      - dawn:
+          branch: dawn
+      - e-release:
+          branch: e-release
+
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-o-ru-closed-loop-consumer-sonar
@@ -251,24 +300,3 @@
     jobs:
       - gerrit-sonar-prescan-script
 
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-release
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
-    jobs:
-      - '{project-name}-gerrit-release-jobs'
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-sonar
-    project-name: '{name}'
-    # 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'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    jobs:
-      - gerrit-maven-sonar

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index 8d25cc1..f19d1f3 100644 (file)
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -52,6 +52,8 @@
           branch: master
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -93,6 +95,8 @@
           branch: master
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -114,3 +118,6 @@
           branch: master
       - dawn:
           branch: dawn
+      - e-release:
+          branch: e-release
+

diff --git a/jjb/pti-o2/pti-o2.yaml b/jjb/pti-o2/pti-o2.yaml
index 5f6e62f..5ff1747 100644 (file)
--- a/jjb/pti-o2/pti-o2.yaml
+++ b/jjb/pti-o2/pti-o2.yaml
@@ -47,22 +47,6 @@
       - master:
           branch: master
 
-- project:
-    <<: *pti_o2_common
-    <<: *pti_o2_python
-    name: pti-o2-imsdms-sonarqube
-    sonar-project-file: ""
-    sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=src
-        sonar.python.coverage.reportPaths=coverage.xml
-    jobs:
-      - gerrit-tox-sonarqube
-
 - pti_o2_docker: &pti_o2_docker_common
     <<: *pti_o2_common
     # values apply to all pti/o2 docker projects
@@ -73,6 +57,7 @@
     container-tag-method: yaml-file
     # docker-root: src
     # if no container-tag-yaml-dir is defined, container-tag.yml is taken from the docker-root
+    container-tag-yaml-dir: stages
     build-node: ubuntu1804-docker-4c-4g
     stream:
       - master:
@@ -80,13 +65,16 @@
 
 - project:
     <<: *pti_o2_docker_common
-    name: pti-o2-imsdms-docker-verify
-    # jenkins job name prefix
-    project-name: '{name}'
-    container-tag-method: latest
-    docker-build-args: '--network=host -f Dockerfile'
+    name: pti-o2-imsdms
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+        - compare-type: REG_EXP
+          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
-      - gerrit-docker-verify
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
 
 - project:
     <<: *pti_o2_docker_common
@@ -94,9 +82,9 @@
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
-    container-tag-yaml-dir: release
+    container-tag-yaml-dir: releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'release/.*'
+        pattern: 'releases\/.*\.yaml'
     jobs:
       - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/pti-rtp/upload-inf.sh b/jjb/pti-rtp/upload-inf.sh
index d95b282..afcdd26 100644 (file)
--- a/jjb/pti-rtp/upload-inf.sh
+++ b/jjb/pti-rtp/upload-inf.sh
@@ -24,9 +24,13 @@ set -eu -o pipefail
 echo "INFO: creating virtual environment"
 virtualenv -p python3 /tmp/venv
 PATH=/tmp/venv/bin:$PATH
-pipup="python -m pip install -q --upgrade lftools"
-echo "INFO: installing packages: $pipup"
-$pipup
+
+pip_pkgs="pip setuptools lftools"
+for pkg in $pip_pkgs; do
+    cmd_pip="python -m pip install -q --upgrade $pkg"
+    echo "INFO: installing packages: $cmd_pip"
+    $cmd_pip
+done
 
 # NEXUS_URL is set by Jenkins
 nexus_repo_id="images"