Merge "Build and Post-Docker-Build Verify script for ICS sample producer and consumer" master
authorJohn Keeney <john.keeney@est.tech>
Fri, 26 Apr 2024 09:36:49 +0000 (09:36 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Fri, 26 Apr 2024 09:36:49 +0000 (09:36 +0000)
17 files changed:
jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml
jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml
jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
jjb/com-pylog/com-pylog.yaml
jjb/doc/doc.yaml
jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
jjb/nonrtric/ics-producer-consumer-tests.sh [new file with mode: 0755]
jjb/nonrtric/nonrtric.yaml
jjb/pti-o2/pti-o2.yaml
jjb/ric-app-ad/ric-app-ad.yaml
jjb/ric-app-lp/ric-app-lp.yaml
jjb/ric-app-qp/ric-app-qp.yaml
jjb/shell/install-deb-rmr.sh
jjb/sim-a1-interface/sim-a1-interface.yaml

index 4714a14..38cbe4c 100644 (file)
       - master:
           branch: master
 
-- project:
-    <<: *aiml_de_docker_common
-    name: aiml-fw-athp-data-extraction-tox-verify
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    python-version: python3
-    # skip docs on verify
-    tox-envs: code
-    tox-dir: "."
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: "dataextraction/.*"
-    stream:
-      # run verify on all branches
-      # the ANT pattern is **/{branch}, we are exploiting that.
-      - all:
-          branch: master
-    jobs:
-      - gerrit-tox-verify
-
 - project:
     <<: *aiml_de_docker_common
     name: aiml-fw-athp-data-extraction-sonarqube
index cf1c323..18e4db5 100644 (file)
     # maven settings file has docker credentials
     mvn-settings: aiml-fw-athp-sdk-feature-store-settings
 
-- project:
-    <<: *aiml_fssdk_docker_common
-    name: aiml-fw-athp-sdk-feature-store-tox-verify
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    python-version: python3
-    # skip docs on verify
-    tox-envs: code
-    tox-dir: "."
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: "featurestoresdk/.*"
-    stream:
-      # run verify on all branches
-      # the ANT pattern is **/{branch}, we are exploiting that.
-      - all:
-          branch: master
-    jobs:
-      - gerrit-tox-verify
-
 - project:
     <<: *aiml_fssdk_docker_common
     name: aiml-fw-athp-sdk-feature-store-sonarqube
index 39de221..f05243f 100644 (file)
     # maven settings file has docker credentials
     mvn-settings: aiml-fw-athp-sdk-model-storage-settings
 
-- project:
-    <<: *aiml_mssdk_docker_common
-    name: aiml-fw-athp-sdk-model-storage-tox-verify
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    python-version: python3
-    # skip docs on verify
-    tox-envs: code
-    tox-dir: "."
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: "modelmetricsdk/.*"
-    stream:
-      # run verify on all branches
-      # the ANT pattern is **/{branch}, we are exploiting that.
-      - all:
-          branch: master
-    jobs:
-      - gerrit-tox-verify
-
 - project:
     <<: *aiml_mssdk_docker_common
     name: aiml-fw-athp-sdk-model-storage-sonarqube
index 2429c4c..7d21fdf 100644 (file)
       - master:
           branch: master
 
-- project:
-    <<: *aiml_kfc_docker_common
-    name: aiml-fw-athp-tps-kubeflow-adapter-tox-verify
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    python-version: python3
-    # skip docs on verify
-    tox-envs: code
-    tox-dir: "."
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: "kfadapter/.*"
-    stream:
-      # run verify on all branches
-      # the ANT pattern is **/{branch}, we are exploiting that.
-      - all:
-          branch: master
-    jobs:
-      - gerrit-tox-verify
-
 - project:
     <<: *aiml_kfc_docker_common
     name: aiml-fw-athp-tps-kubeflow-adapter-sonarqube
index 51c8fe7..642a791 100644 (file)
     stream:
       - master:
           branch: master
-- project:
-    <<: *aiml_tm_docker_common
-    name: aiml-fw-awmf-tm-tox-verify
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    python-version: python3
-    # skip docs on verify
-    tox-envs: code
-    tox-dir: "."
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: "trainingmgr/.*"
-    stream:
-      # run verify on all branches
-      # the ANT pattern is **/{branch}, we are exploiting that.
-      - all:
-          branch: master
-    jobs:
-      - gerrit-tox-verify
 
 - project:
     <<: *aiml_tm_docker_common
index 8323ca7..c619ffc 100644 (file)
@@ -66,7 +66,6 @@
         pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - "{project-name}-gerrit-pypi-release-jobs"
-      - gerrit-tox-verify
     stream:
       - master:
           branch: master
index 4091980..ade4e7c 100644 (file)
@@ -4,11 +4,3 @@
     project-name: doc
     views:
       - project-view
-
-- project:
-    name: doc-verify
-    project: doc
-    project-name: doc
-    python-version: python3
-    jobs:
-      - gerrit-tox-verify
index 8bdd59d..d150262 100644 (file)
@@ -97,8 +97,6 @@
       - compare-type: REG_EXP
         pattern: "catalogue-enhanced/.*"
     stream:
-      - master:
-          branch: master
       - g-release:
           branch: g-release
       - h-release:
index ff1d3d6..05f77b6 100644 (file)
@@ -71,9 +71,9 @@
     container-tag-method: yaml-file
     container-tag-yaml-dir: servicemanager
     # use host network to clone from our gerrit
-    docker-build-args: "--network=host"
-    # Directory with Dockerfile
-    docker-root: "servicemanager"
+    docker-build-args: "--network=host -f servicemanager/Dockerfile"
+    # Dockerfile is in a subdir
+    docker-root: "."
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
diff --git a/jjb/nonrtric/ics-producer-consumer-tests.sh b/jjb/nonrtric/ics-producer-consumer-tests.sh
new file mode 100755 (executable)
index 0000000..2fbefc4
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eux -o pipefail
+
+echo "Starting ics-producer-consumer-tests.sh which will execute sample-services/ics-producer-consumer/start.sh"
+cd sample-services/ics-producer-consumer
+bash start.sh
+
+echo "Finished ics-producer-consumer-tests.sh"
\ No newline at end of file
index 53352fb..064ad0a 100644 (file)
     name: nonrtric-sample-helloworld
     project-name: "{name}"
     # image name
-    docker-name: "o-ranc-sc/nonrtric-sample-helloworld"
+    docker-name: "o-ran-sc/nonrtric-sample-helloworld"
     # Directory with Dockerfile
     docker-root: "sample-services/hello-world"
     # Limit build trigger to appropriate files
       - master:
           branch: master
 
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-sample-icsproducer
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/nonrtric-sample-icsproducer"
+    # Directory with Dockerfile
+    docker-root: "sample-services/ics-producer-consumer/producer"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "sample-services/ics-producer-consumer/producer/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    post_docker_build_script: !include-raw-escape:
+      - ics-producer-consumer-tests.sh
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *nonrtric_docker_common
+    name: nonrtric-sample-icsconsumer
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/nonrtric-sample-icsconsumer"
+    # Directory with Dockerfile
+    docker-root: "sample-services/ics-producer-consumer/consumer"
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "sample-services/ics-producer-consumer/consumer/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    post_docker_build_script: !include-raw-escape:
+      - ics-producer-consumer-tests.sh
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+
 # Jobs to verify / build images for testing
 - project:
     <<: *nonrtric_docker_common
index 419b832..790d4fe 100644 (file)
     # no need to verify docs
     tox-envs: code,flake8
 
-- project:
-    <<: *pti_o2_common
-    <<: *pti_o2_python
-    name: pti-o2-imsdms-verify
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
-    jobs:
-      - gerrit-tox-verify
-    stream:
-      - master:
-          branch: master
-
 - _pti_o2_docker: &pti_o2_docker_common
     <<: *pti_o2_common
     # values apply to all pti/o2 docker projects
index 6d3aa1c..c7fa354 100644 (file)
     # no need to verify docs
     tox-envs: code,flake8
 
-- project:
-    <<: *ad_common
-    <<: *ad_python
-    name: ric-app-ad-py-verify
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
-    jobs:
-      - gerrit-tox-verify
-    stream:
-      - master:
-          branch: master
-
 - project:
     <<: *ad_common
     <<: *ad_python
index 00b2b56..a4aebbc 100644 (file)
     # no need to verify docs
     tox-envs: code,flake8
 
-- project:
-    <<: *lp_common
-    <<: *lp_python
-    name: ric-app-lp-py-verify
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
-    jobs:
-      - gerrit-tox-verify
-    stream:
-      - master:
-          branch: master
-
 - project:
     <<: *lp_common
     <<: *lp_python
index f21f638..bc92e00 100644 (file)
     # no need to verify docs
     tox-envs: code,flake8
 
-- project:
-    <<: *qp_common
-    <<: *qp_python
-    name: ric-app-qp-py-verify
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
-    jobs:
-      - gerrit-tox-verify
-    stream:
-      - master:
-          branch: master
-
 - project:
     <<: *qp_common
     <<: *qp_python
index ad24aea..dbe3522 100644 (file)
@@ -28,7 +28,7 @@ echo "---> install-deb-rmr.sh"
 set -eux
 
 version_file=rmr-version.yaml
-if [[ -f $version_file ]]; then
+if [ -f "$version_file" ]; then
     # pipeline is less elegant than yq but that requires venv and pip install
     repo=$(grep "^repo:" "$version_file" | cut -d: -f2 | xargs )
     ver=$(grep "^version:" "$version_file" | cut -d: -f2 | xargs)
@@ -36,7 +36,7 @@ else
     echo "File $version_file not found."
     exit 1
 fi
-if [[ -z $ver ]]; then
+if [ -z "$ver" ]; then
     echo "Failed to get RMR version string from file $version_file"
     exit 1
 fi
index 44c082b..f534aa3 100644 (file)
     mvn-settings: sim-a1-interface-settings
     java-version: openjdk17
 
-- project:
-    <<: *sim_a1_interface_common
-    name: a1-simulator-verify
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    python-version: python3
-    tox-envs: code
-    stream:
-      - master:
-          branch: master
-    jobs:
-      - gerrit-tox-verify
-
 - project:
     <<: *sim_a1_interface_common
     name: a1-simulator