From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 12 Oct 2022 15:37:14 +0000 (+0000)
Subject: Merge "Chore: Automation adds aiml-fw/athp/tps/kubeflow-adapter config files"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=d1d45bd01994c7ece912b5a4d0a505c452f29983;hp=304f026c8ac9a178d9292640e5e63fd5f954967e;p=ci-management.git

Merge "Chore: Automation adds aiml-fw/athp/tps/kubeflow-adapter config files"
---

diff --git a/global-jjb b/global-jjb
index 1d572dc0..e2c560aa 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 1d572dc0110bdd1d9881fa6b4f2d60d43b6138da
+Subproject commit e2c560aa754635dee7b536ef4e96cc00b723107f
diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
index 8c6bc5ab..679799d7 100644
--- a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
+++ b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
@@ -50,7 +50,6 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
-      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
diff --git a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
index d08b3950..ed48c338 100644
--- a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
+++ b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
@@ -35,10 +35,7 @@
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
-      - "{project-name}-gerrit-docker-jobs"
+      - '{project-name}-gerrit-docker-jobs'
     stream:
       - master:
           branch: master
-      - f-release:
-          branch: f-release
-
diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
index 53eeff0e..2b6e8054 100644
--- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
+++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
@@ -44,7 +44,6 @@
     # Includes verify and merge jobs
     jobs:
       - "{project-name}-gerrit-docker-jobs"
-      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
@@ -74,7 +73,6 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
-      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
index 0618200e..c36a841b 100644
--- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
+++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
@@ -50,7 +50,6 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
-      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
@@ -76,7 +75,6 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
-      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index 73958916..740bb899 100644
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -90,37 +90,7 @@
 
 - project:
     <<: *ves_docker_common
-    name: smo-ves-collector-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-ves-dmaap-adapter-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-ves-influxdb-connector-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-ves-post-config-release
+    name: smo-ves-release
     project-name: '{name}'
     # maven release requires sigul which requires centos
     # container release requires docker