From 86a589e480a0605666f6e5f71a14ec60d3fd4f90 Mon Sep 17 00:00:00 2001
From: elinuxhenrik <henrik.b.andersson@est.tech>
Date: Tue, 4 Jan 2022 14:25:41 +0100
Subject: [PATCH] Start using specific jobs for Go products

Issue-ID: NONRTRIC-701
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: If95f82817d7d1c513f6ae7491e03ed4cfe90e5d0
---
 dmaap-mediator-producer/build_and_test.sh          |  22 ----
 dmaap-mediator-producer/container-tag.yaml         |   5 +
 dmaap-mediator-producer/pom.xml                    | 112 ---------------------
 pom.xml                                            |   3 -
 test/kafka-procon/.gitignore                       |   1 +
 test/usecases/odusliceassurance/goversion/pom.xml  |  96 ------------------
 .../goversion/build_and_test.sh                    |  22 ----
 .../oruclosedlooprecovery/goversion/pom.xml        | 112 ---------------------
 8 files changed, 6 insertions(+), 367 deletions(-)
 delete mode 100755 dmaap-mediator-producer/build_and_test.sh
 create mode 100644 dmaap-mediator-producer/container-tag.yaml
 delete mode 100644 dmaap-mediator-producer/pom.xml
 delete mode 100644 test/usecases/odusliceassurance/goversion/pom.xml
 delete mode 100755 test/usecases/oruclosedlooprecovery/goversion/build_and_test.sh
 delete mode 100644 test/usecases/oruclosedlooprecovery/goversion/pom.xml

diff --git a/dmaap-mediator-producer/build_and_test.sh b/dmaap-mediator-producer/build_and_test.sh
deleted file mode 100755
index 397124d7..00000000
--- a/dmaap-mediator-producer/build_and_test.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-##############################################################################
-#
-#   Copyright (C) 2021: Nordix Foundation
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-##############################################################################
-
-go build
-
-go test ./...
diff --git a/dmaap-mediator-producer/container-tag.yaml b/dmaap-mediator-producer/container-tag.yaml
new file mode 100644
index 00000000..f84eeb10
--- /dev/null
+++ b/dmaap-mediator-producer/container-tag.yaml
@@ -0,0 +1,5 @@
+# The Jenkins job requires a tag to build the Docker image.
+# By default this file is in the docker build directory,
+# but the location can configured in the JJB template.
+---
+tag: 1.1.0
diff --git a/dmaap-mediator-producer/pom.xml b/dmaap-mediator-producer/pom.xml
deleted file mode 100644
index eb30b6bd..00000000
--- a/dmaap-mediator-producer/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>oransc.org</groupId>
-    <artifactId>dmaapmediatorproducer</artifactId>
-    <version>1.1.0</version>
-    <properties>
-        <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
-    </properties>
-
-     <build>
-        <plugins>
-            <plugin>
-              <artifactId>exec-maven-plugin</artifactId>
-              <groupId>org.codehaus.mojo</groupId>
-              <executions>
-                  <execution>
-                      <id>Build Go binary</id>
-                      <phase>generate-sources</phase>
-                      <goals>
-                          <goal>exec</goal>
-                      </goals>
-                      <configuration>
-                          <executable>${basedir}/build_and_test.sh</executable>
-                      </configuration>
-                  </execution>
-              </executions>
-          </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker-maven-plugin.version}</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>generate-nonrtric-dmaap-mediator-producer-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
-                            <images>
-                                <image>
-                                    <name>o-ran-sc/nonrtric-dmaap-mediator-producer:${project.version}</name>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <contextDir>${basedir}</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
-                                        <args>
-                                            <JAR>${project.build.finalName}.jar</JAR>
-                                        </args>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>push-nonrtric-dmaap-mediator-producer-image</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <configuration>
-                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
-                            <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
-                            <images>
-                                <image>
-                                    <name>o-ran-sc/nonrtric-dmaap-mediator-producer:${project.version}</name>
-                                    <build>
-                                        <contextDir>${basedir}</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
-                                        <args>
-                                            <JAR>${project.build.finalName}.jar</JAR>
-                                        </args>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                            <tag>latest</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-      </plugins>
-    </build>
-</project>
diff --git a/pom.xml b/pom.xml
index 39c316e1..1a7d8886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,6 @@
         <module>r-app-catalogue</module>
         <module>helm-manager</module>
         <module>dmaap-adaptor-java</module>
-        <module>dmaap-mediator-producer</module>
-        <module>test/usecases/oruclosedlooprecovery/goversion</module>
-        <module>test/usecases/odusliceassurance/goversion</module>
     </modules>
     <build>
         <plugins>
diff --git a/test/kafka-procon/.gitignore b/test/kafka-procon/.gitignore
index 6703e3c7..aa0b599f 100644
--- a/test/kafka-procon/.gitignore
+++ b/test/kafka-procon/.gitignore
@@ -2,3 +2,4 @@
 .dockererr
 .env
 .payload
+kafkaprocon
diff --git a/test/usecases/odusliceassurance/goversion/pom.xml b/test/usecases/odusliceassurance/goversion/pom.xml
deleted file mode 100644
index f741038a..00000000
--- a/test/usecases/odusliceassurance/goversion/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>oransc.org</groupId>
-    <artifactId>o-du-slice-assurance</artifactId>
-    <version>1.1.0</version>
-    <properties>
-        <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
-    </properties>
-
-     <build>
-        <plugins>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker-maven-plugin.version}</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>generate-nonrtric-o-du-slice-assurance-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
-                            <images>
-                                <image>
-                                    <name>o-ran-sc/nonrtric-o-du-slice-assurance:${project.version}</name>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <contextDir>${basedir}</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
-                                        <args>
-                                            <JAR>${project.build.finalName}.jar</JAR>
-                                        </args>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>push-nonrtric-o-du-slice-assurance-image</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <configuration>
-                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
-                            <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
-                            <images>
-                                <image>
-                                    <name>o-ran-sc/nonrtric-o-du-slice-assurance:${project.version}</name>
-                                    <build>
-                                        <contextDir>${basedir}</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
-                                        <args>
-                                            <JAR>${project.build.finalName}.jar</JAR>
-                                        </args>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                            <tag>latest</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-      </plugins>
-    </build>
-</project>
diff --git a/test/usecases/oruclosedlooprecovery/goversion/build_and_test.sh b/test/usecases/oruclosedlooprecovery/goversion/build_and_test.sh
deleted file mode 100755
index 397124d7..00000000
--- a/test/usecases/oruclosedlooprecovery/goversion/build_and_test.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-##############################################################################
-#
-#   Copyright (C) 2021: Nordix Foundation
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-##############################################################################
-
-go build
-
-go test ./...
diff --git a/test/usecases/oruclosedlooprecovery/goversion/pom.xml b/test/usecases/oruclosedlooprecovery/goversion/pom.xml
deleted file mode 100644
index dc568e19..00000000
--- a/test/usecases/oruclosedlooprecovery/goversion/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>oransc.org</groupId>
-    <artifactId>o-ru-closed-loop-consumer</artifactId>
-    <version>1.1.0</version>
-    <properties>
-        <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
-    </properties>
-
-     <build>
-        <plugins>
-            <plugin>
-              <artifactId>exec-maven-plugin</artifactId>
-              <groupId>org.codehaus.mojo</groupId>
-              <executions>
-                  <execution>
-                      <id>Build Go binary</id>
-                      <phase>generate-sources</phase>
-                      <goals>
-                          <goal>exec</goal>
-                      </goals>
-                      <configuration>
-                          <executable>${basedir}/build_and_test.sh</executable>
-                      </configuration>
-                  </execution>
-              </executions>
-          </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker-maven-plugin.version}</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>generate-nonrtric-o-ru-closed-loop-consumer-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
-                            <images>
-                                <image>
-                                    <name>o-ran-sc/nonrtric-o-ru-closed-loop-consumer:${project.version}</name>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <contextDir>${basedir}</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
-                                        <args>
-                                            <JAR>${project.build.finalName}.jar</JAR>
-                                        </args>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>push-nonrtric-o-ru-closed-loop-consumer-image</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <configuration>
-                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
-                            <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
-                            <images>
-                                <image>
-                                    <name>o-ran-sc/nonrtric-o-ru-closed-loop-consumer:${project.version}</name>
-                                    <build>
-                                        <contextDir>${basedir}</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
-                                        <args>
-                                            <JAR>${project.build.finalName}.jar</JAR>
-                                        </args>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                            <tag>latest</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-      </plugins>
-    </build>
-</project>
-- 
2.16.6