X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsim-a1-interface%2Fsim-a1-interface.yaml;h=44c082b2afb88e67a01f518072e1add40153b22b;hb=5ee9050a86a8772fc1480bf54db7467513637b18;hp=f8391e00f3b0fb64061d2020440444f5b62c5188;hpb=883e9ed23cbef97dfee78ac9bb08ea79b26840f6;p=ci-management.git

diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml
index f8391e00..44c082b2 100644
--- a/jjb/sim-a1-interface/sim-a1-interface.yaml
+++ b/jjb/sim-a1-interface/sim-a1-interface.yaml
@@ -5,16 +5,8 @@
     views:
       - project-view
 
-- project:
-    name: sim-a1-interface-info
-    project: sim/a1-interface
-    project-name: sim-a1-interface
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- sim_a1_interface_common: &sim_a1_interface_common
-    # values apply to all projects here
+- _sim_a1_interface_common:
+    &sim_a1_interface_common # values apply to all projects here
     name: sim-a1-interface-common
     # git repo
     project: sim/a1-interface
@@ -22,43 +14,62 @@
     project-name: sim-a1-interface
     # maven settings file has docker credentials
     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
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # source of docker tag
     container-tag-method: yaml-file
-    # use tag yaml from subdirectory
-    container-tag-yaml-dir: near-rt-ric-simulator/scripts
+    docker-root: near-rt-ric-simulator
     # use host network
-    docker-build-args: '-f near-rt-ric-simulator/scripts/Dockerfile --network=host'
+    docker-build-args: "--network=host"
     build-node: ubuntu1804-docker-4c-4g
     stream:
       - master:
           branch: master
+      - g-release:
+          branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
 
 - project:
     <<: *sim_a1_interface_common
     name: sim-a1-interface-sonarqube
     python-version: python3
-    build-node: ubuntu1804-builder-2c-2g
+    build-node: ubuntu2004-builder-2c-2g
     sonar-project-file: ""
+    sonar-jdk: openjdk17
     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=near-rt-ric-simulator
-        sonar.python.coverage.reportPaths=coverage.xml
+      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=near-rt-ric-simulator
+      sonar.python.coverage.reportPaths=coverage.xml
     jobs:
       - gerrit-tox-sonarqube
 
-
 - project:
     <<: *sim_a1_interface_common
     name: sim-a1-interface-release
@@ -66,4 +77,11 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
\ No newline at end of file
+      - "{project-name}-gerrit-release-jobs"
+    stream:
+      - master:
+          branch: master
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release