Merge "Simplify ORAN jjb file organization"

diff --git a/jjb/scp-oam-modeling/scp-oam-modeling.yaml b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
index c0efc34..cf9f392 100644 (file)
--- a/jjb/scp-oam-modeling/scp-oam-modeling.yaml
+++ b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
@@ -1,4 +1,10 @@
 ---
+- project:
+    name: scp-oam-modeling-project-view
+    project-name: scp-oam-modeling
+    views:
+      - project-view
+
 - project:
     name: scp-oam-modeling-info
     project: scp/oam/modeling
@@ -6,3 +12,51 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- scp_oam_modeling_features_common: &scp_oam_modeling_features_common
+    # project contains model information for nonrtric-o1-controller features
+    name: scp-oam-modeling-features-common
+    project: scp/oam/modeling
+    project-name: scp-oam-modeling-features
+    mvn-settings: scp-oam-modeling-settings
+    java-version: openjdk8
+    maven-version: mvn35
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    mvn-params: '-f features'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'features/.*'
+
+- project:
+    <<: *scp_oam_modeling_features_common
+    name: scp-oam-modeling-features
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - 'master':
+          branch: 'master'
+
+- project:
+    <<: *scp_oam_modeling_features_common
+    name: scp-oam-modeling-features-sonar
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    build-node: ubuntu1604-builder-4c-4g
+    jobs:
+      - gerrit-maven-sonar
+
+- project:
+    name: scp-oam-modeling-release
+    project-name: scp-oam-modeling
+    project: scp/oam/modeling
+    mvn-settings: scp-oam-modeling-settings
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml
index f8391e0..bc67ea8 100644 (file)
--- a/jjb/sim-a1-interface/sim-a1-interface.yaml
+++ b/jjb/sim-a1-interface/sim-a1-interface.yaml
@@ -30,10 +30,9 @@
     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: