Add aai docker template

Change-Id: Id420552d166815107d0f25ea71a32a98062f52b7
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
index f27ade2..89aeedb 100644 (file)
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -6,10 +6,9 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'ajsc-aai/pom.xml'
-          mvn-goals: ''
-          mvn-profile: 'docker'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'ajsc-aai/pom.xml'
+          mvn-goals: '-P docker'
 
     project: 'aai/aai-service'
     stream:

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 5338f76..293c471 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -6,10 +6,9 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: ''
-          mvn-profile: 'docker'
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'pom.xml'
+          mvn-goals: '-P docker'
     project: 'aai/model-loader'
     stream:
       - 'master':

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index a84a7d0..7b173e9 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -644,3 +644,68 @@
           global-settings-type: cfp
 
       - shell: '{script}'
+
+- job-template:
+    name: '{project-name}-{stream}-aai-docker-java-daily'
+    project-type: freestyle
+    node: 'ubuntu1604-docker-8c-8g'
+
+    properties:
+      - ecomp-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - ecomp-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - ecomp-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      # 12 AM UTC
+      - timed: 'H 12 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
+    builders:
+
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+      - docker-login
+
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: 'pom.xml'
+          goals: 'clean install -DskipTests'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: '{pom}'
+          goals: '{mvn-goals}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+          properties:
+            - maven.test.skip=true
+            - docker.pull.registry=nexus3.openecomp.org:10001
+            - docker.push.registry=nexus3.openecomp.org:10003
+
+      - shell: !include-raw: include-docker-push.sh

diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
new file mode 100644 (file)
index 0000000..1017d54
--- /dev/null
+++ b/jjb/include-docker-push.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
+SEARCH="aai-service";
+
+if [[ $PROJECT =~ $SEARCH ]] ; then
+    docker push $DOCKER_REPOSITORY/ecomp/ajsc-aai:latest;
+else
+    docker push $DOCKER_REPOSITORY/ecomp/model-loader:latest;
+fi