From: elinuxhenrik <henrik.b.andersson@est.tech>
Date: Wed, 27 Oct 2021 07:30:21 +0000 (+0200)
Subject: Revert "Reorganize nonrtric builds"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=952802d36e0ac7c843d4ad46fc127cbd7bda3a06;p=ci-management.git

Revert "Reorganize nonrtric builds"

This reverts commit 0e41f019e4269add97ea8a2b9ea14838f5645f12.

The changes did not achieve the expected outcome.

Issue-ID: NONRTRIC-612
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: Ice7269386501da948f850114fbebc4189bbaa49f
---

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 7b22e9d8..57434c49 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -24,16 +24,9 @@
     mvn-version: mvn36
     java-version: openjdk11
 
-# nonrtric:policy-agent
-# Docker image for nonrtric-policy-agent
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-policy-agent-docker
-    project-name: '{name}'
-    mvn-params: '-f policy-agent/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'policy-agent/.*'
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
     jobs:
       - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge
@@ -71,28 +64,6 @@
       - dawn:
           branch: dawn
 
-# nonrtric:sdnc-a1-controller
-# Docker image for nonrtric-sdnc-a1-controller
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-sdnc-a1-controller-docker
-    project-name: '{name}'
-    mvn-params: '-f sdnc-a1-controller/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'sdnc-a1-controller/.*'
-    jobs:
-      - gerrit-maven-docker-verify
-      - gerrit-maven-docker-merge
-      - gerrit-maven-docker-stage
-    stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
-      - dawn:
-          branch: dawn
-
 # nonrtric:sdnc-a1-controller
 # Maven artifacts for nonrtric-sdnc-a1-controller
 - project:
@@ -118,28 +89,6 @@
       - dawn:
           branch: dawn
 
-# nonrtric:enrichment-coordinator-service
-# Docker image for nonrtric-enrichment-coordinator-service
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-enrichment-coordinator-service-docker
-    project-name: '{name}'
-    mvn-params: '-f enrichment-coordinator-service/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'enrichment-coordinator-service/.*'
-    jobs:
-      - gerrit-maven-docker-verify
-      - gerrit-maven-docker-merge
-      - gerrit-maven-docker-stage
-    stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
-      - dawn:
-          branch: dawn
-
 # nonrtric:enrichment-coordinator-service
 # Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
@@ -165,28 +114,6 @@
       - dawn:
           branch: dawn
 
-# nonrtric:r-app-catalogue
-# Docker image for nonrtric-r-app-catalogue
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-r-app-catalogue-docker
-    project-name: '{name}'
-    mvn-params: '-f r-app-catalogue/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'r-app-catalogue/.*'
-    jobs:
-      - gerrit-maven-docker-verify
-      - gerrit-maven-docker-merge
-      - gerrit-maven-docker-stage
-    stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
-      - dawn:
-          branch: dawn
-
 # nonrtric:r-app-catalogue
 # Maven artifacts for r-app-catalogue
 - project:
@@ -212,26 +139,6 @@
       - dawn:
           branch: dawn
 
-# nonrtric:helm-manager
-# Docker image for nonrtric-helm-manager
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-helm-manager-docker
-    project-name: '{name}'
-    mvn-params: '-f helm-manager/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'helm-manager/.*'
-    jobs:
-      - gerrit-maven-docker-verify
-      - gerrit-maven-docker-merge
-      - gerrit-maven-docker-stage
-    stream:
-      - master:
-          branch: master
-      - dawn:
-          branch: dawn
-
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-o-ru-closed-loop-recovery