Merge "Chore: Add Mahesh as ci-man committer"

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index e6dfb09..d1bf6e7 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -8,7 +8,7 @@ REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_EMAIL=collab-it+o-ran-sc-release@linuxfoundation.org
 RELEASE_USERNAME=o-ran-sc-release
 S3_BUCKET=
-SIGUL_BRIDGE_IP=44.232.126.158
+SIGUL_BRIDGE_IP=54.200.225.191
 SIGUL_KEY=oran-release-2022
 SILO=production
 MASTER_RTD_PROJECT=doc

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 47beabc..25faaaa 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -6,7 +6,7 @@ LOGS_SERVER=https://logs.o-ran-sc.org
 NEXUS_URL=https://nexus.o-ran-sc.org
 REGISTRY_PORTS=10001 10002 10003 10004
 S3_BUCKET=
-SIGUL_BRIDGE_IP=44.232.126.158
+SIGUL_BRIDGE_IP=54.200.225.191
 SIGUL_KEY=oran-sandbox
 SILO=sandbox
 MASTER_RTD_PROJECT=doc-test

diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index de70a93..12d221e 100644 (file)
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -26,6 +26,7 @@
 - project:
     <<: *ves_docker_common
     name: smo-ves
+    project-name: '{name}'
     # image name
     docker-name: 'smo-collector'
     # Dockerfile is in a subdir
@@ -38,9 +39,62 @@
       - master:
           branch: master
 
+- project:
+    <<: *ves_docker_common
+    name: smo-dmaap
+    project-name: '{name}'
+    # image name
+    docker-name: 'smo-dmaap-adapter'
+    # Dockerfile is in a subdir
+    docker-root: dmaapadapter
+    # source of docker tag
+    container-tag-method: yaml-file
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *ves_docker_common
+    name: smo-influxdb
+    project-name: '{name}'
+    # image name
+    docker-name: 'smo-influxdb-connector'
+    # Dockerfile is in a subdir
+    docker-root: influxdb-connector
+    # source of docker tag
+    container-tag-method: yaml-file
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
+
 - project:
     <<: *ves_docker_common
     name: smo-ves-release
+    project-name: '{name}'
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *ves_docker_common
+    name: smo-dmaap-release
+    project-name: '{name}'
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *ves_docker_common
+    name: smo-influxdb-release
+    project-name: '{name}'
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g