Merge "updated it-otf.yaml to auto generate docker images for two new vths"

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 56e0a1b..165739a 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -22,19 +22,10 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-settings
     mvn-version: mvn36
-
-- nonrtric_jdk11: &nonrtric_jdk11
-    <<: *nonrtric_jdk_common
-    name: nonrtric-jdk11
     java-version: openjdk11
 
-- nonrtric_jdk8: &nonrtric_jdk8
-    <<: *nonrtric_jdk_common
-    name: nonrtric-jdk8
-    java-version: openjdk8
-
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
     jobs:
       - gerrit-maven-docker-verify:
@@ -48,7 +39,7 @@
 # nonrtric:policy-agent
 # Maven artifacts for nonrtric-policy-agent
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-policy-agent
     project-name: '{name}'
     mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
@@ -69,7 +60,7 @@
 # nonrtric:sdnc-a1-controller
 # Maven artifacts for nonrtric-sdnc-a1-controller
 - project:
-    <<: *nonrtric_jdk8
+    <<: *nonrtric_jdk_common
     name: nonrtric-sdnc-a1-controller
     project-name: '{name}'
     mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
@@ -88,7 +79,7 @@
           branch: master
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-release
     branch: master
     # maven release requires sigul which requires centos
@@ -98,7 +89,7 @@
       - '{project-name}-gerrit-release-jobs'
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-sonar
     # template goal install builds docker image unnecessarily
     mvn-params: '-Ddocker.skip=true -Dexec.skip=true'

diff --git a/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml b/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml
new file mode 100644 (file)
index 0000000..ce4da6f
--- /dev/null
+++ b/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml
@@ -0,0 +1,60 @@
+---
+- project:
+    name: oam-tr069-adapter-project-view
+    project-name: oam-tr069-adapter
+    views:
+      - project-view
+
+- project:
+    name: oam-tr069-adapter-info
+    project: oam/tr069-adapter
+    project-name: oam-tr069-adapter
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- tr069-adapter-jdk08: &tr069-adapter-jdk08
+    # values apply to all projects here
+    name: tr069-adapter-jdk08
+    # git repo
+    project: oam/tr069-adapter
+    # jenkins job name prefix
+    project-name: oam-tr069-adapter
+    mvn-settings: oam-tr069-adapter-settings
+    # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
+    java-version: openjdk8
+    mvn-version: mvn36
+
+- project:
+    <<: *tr069-adapter-jdk08
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *tr069-adapter-jdk08
+    name: tr069-adapter-sonar
+    # 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}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar
+
+- project:
+    <<: *tr069-adapter-jdk08
+    name: tr069-adapter-release
+    branch: master
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/sim-e2-interface/sim-e2-interface.yaml b/jjb/sim-e2-interface/sim-e2-interface.yaml
index 6307700..43fd59d 100644 (file)
--- a/jjb/sim-e2-interface/sim-e2-interface.yaml
+++ b/jjb/sim-e2-interface/sim-e2-interface.yaml
@@ -13,29 +13,21 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- sim_e2_interface_docker: &sim_e2_interface_docker
-    # values apply to all sim/e2-interface docker projects
-    name: sim-e2-interface-docker
+- sim_e2_interface_common: &sim_e2_interface_common
+    # values apply to all projects here
+    name: sim-e2-interface-common
     # git repo
     project: sim/e2-interface
     # jenkins job name prefix
     project-name: sim-e2-interface
     # maven settings file has docker credentials
     mvn-settings: sim-e2-interface-settings
-    # source of docker tag
-    container-tag-method: yaml-file
-    build-node: ubuntu1804-docker-4c-4g
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    stream:
-      - master:
-          branch: master
 
 - project:
-    <<: *sim_e2_interface_docker
-    name: sim-e2-interface-e2sim
-    # jenkins job name prefix
-    project-name: '{name}'
+    <<: *sim_e2_interface_common
+    name: sim-e2-interface-docker
+    build-node: ubuntu1804-docker-4c-4g
+    container-tag-method: yaml-file
     # image name
     docker-name: 'o-ran-sc/ntsim-e2-simulator'
     # docker root
@@ -47,3 +39,17 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *sim_e2_interface_common
+    name: sim-e2-interface-release
+    # sigul requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'