From dfbb40b283f9608e0757b0e509fe757efd0cd1b9 Mon Sep 17 00:00:00 2001
From: Conor Ward <conor.ward@est.tech>
Date: Wed, 21 Nov 2018 16:52:54 +0000
Subject: [PATCH] Add datarouter verify job

Refactor for reuseable job-template
Signed-off-by: Conor Ward <conor.ward@est.tech>

Change-Id: I1e9b6cf6604df0d6b265c6bc6dfe4bc4947914bb
---
 .gitignore                                    |  2 +
 jjb/datafile/datafile-verify-jobs.yaml        | 48 -------------------
 .../dmaap-datarouter-verify-jobs.yaml         | 17 +++++++
 jjb/global/global-templates-java.yaml         | 46 ++++++++++++++++++
 .../verify-jobs.sh}                           |  2 +-
 5 files changed, 66 insertions(+), 49 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 jjb/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
 create mode 100644 jjb/global/global-templates-java.yaml
 rename jjb/{datafile/datafile-verify.sh => global/verify-jobs.sh} (93%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..9d79fbce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# IDE files/directories
+.idea/
diff --git a/jjb/datafile/datafile-verify-jobs.yaml b/jjb/datafile/datafile-verify-jobs.yaml
index 24fa677c..d0ef4bc2 100644
--- a/jjb/datafile/datafile-verify-jobs.yaml
+++ b/jjb/datafile/datafile-verify-jobs.yaml
@@ -15,51 +15,3 @@
 
     jobs:
       - '{project-name}-{stream}-verify-java'
-
-
-- job-template:
-    name: '{project-name}-{stream}-verify-java'
-
-    node: onap-ubuntu1604
-
-    disabled: false
-
-    concurrent: true
-
-    parameters:
-      - project-parameters:
-          project: '{project}'
-          branch: '{branch}'
-      - nordix-gerrit-parameters
-      - string:
-          name: JAVA_HOME
-          default: /usr/lib/jvm/java-1.8.0-openjdk-amd64
-          description: Java home
-      - string:
-          name: MVN_VERSION
-          default: 3.3.9
-          description: Maven version
-      - string:
-          name: MVN_URL
-          default: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$MVN_VERSION/apache-maven-${{MVN_VERSION}}-bin.zip
-          description: URL to download Maven
-      - string:
-          name: MVN
-          default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
-          description: Path to mvn executable
-
-    scm:
-      - git-scm-gerrit:
-          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: '{branch}'
-          refspec: $GERRIT_REFSPEC
-
-    triggers:
-      - nordix-gerrit-trigger-patchset-created:
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - shell:
-          !include-raw-escape: ./datafile-verify.sh
diff --git a/jjb/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml b/jjb/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
new file mode 100644
index 00000000..100b190c
--- /dev/null
+++ b/jjb/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
@@ -0,0 +1,17 @@
+---
+# this job gets triggered when a change is proposed to
+# dmaap/datarouter project on Nordix Gerrit.
+- project:
+
+    name: dmaap-datarouter-verify
+
+    project: dmaap/datarouter
+
+    project-name: dmaap-datarouter
+
+    stream:
+      - nordix-dev:
+          branch: '{stream}'
+
+    jobs:
+      - '{project-name}-{stream}-verify-java'
diff --git a/jjb/global/global-templates-java.yaml b/jjb/global/global-templates-java.yaml
new file mode 100644
index 00000000..639168bc
--- /dev/null
+++ b/jjb/global/global-templates-java.yaml
@@ -0,0 +1,46 @@
+- job-template:
+    name: '{project-name}-{stream}-verify-java'
+
+    node: onap-ubuntu1604
+
+    disabled: false
+
+    concurrent: true
+
+    parameters:
+      - project-parameters:
+          project: '{project}'
+          branch: '{branch}'
+      - nordix-gerrit-parameters
+      - string:
+          name: JAVA_HOME
+          default: /usr/lib/jvm/java-1.8.0-openjdk-amd64
+          description: Java home
+      - string:
+          name: MVN_VERSION
+          default: 3.3.9
+          description: Maven version
+      - string:
+          name: MVN_URL
+          default: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$MVN_VERSION/apache-maven-${{MVN_VERSION}}-bin.zip
+          description: URL to download Maven
+      - string:
+          name: MVN
+          default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
+          description: Path to mvn executable
+
+    scm:
+      - git-scm-gerrit:
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+          branch: '{branch}'
+          refspec: $GERRIT_REFSPEC
+
+    triggers:
+      - nordix-gerrit-trigger-patchset-created:
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    builders:
+      - shell:
+          !include-raw-escape: ./verify-jobs.sh
diff --git a/jjb/datafile/datafile-verify.sh b/jjb/global/verify-jobs.sh
similarity index 93%
rename from jjb/datafile/datafile-verify.sh
rename to jjb/global/verify-jobs.sh
index 51c60245..2ffc1d2b 100755
--- a/jjb/datafile/datafile-verify.sh
+++ b/jjb/global/verify-jobs.sh
@@ -16,4 +16,4 @@ $MVN -version
 echo "----------------------------------------------------"
 echo "Proceeding with unit test"
 echo "----------------------------------------------------"
-$MVN clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+$MVN clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
\ No newline at end of file
-- 
2.25.1