Update jenkins job to use global docker template

[ci-management.git] / jjb / aai / aai-traversal.yaml

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index d2581fe..21abd7f 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -4,16 +4,17 @@
     project-name: 'aai-traversal'
     jobs:
       - gerrit-maven-clm:
-          java-version: ''
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-release-version-java-daily':
+         disabled: true
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-version-daily':
-          pom: 'aai-traversal/pom.xml'
-          mvn-goals: 'docker:build docker:push'
+          disabled: true
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'aai-traversal/pom.xml'
+          mvn-profile: 'docker'
 
     project: 'aai/traversal'
     stream:
@@ -23,36 +24,12 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
-- project:
-    name: aai-traversal-amsterdam
-    project-name: 'aai-traversal'
-    jobs:
-      - gerrit-maven-clm:
-          java-version: ''
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
-      - '{project-name}-{stream}-aai-docker-java-version-daily':
-          pom: 'aai-traversal/pom.xml'
-          mvn-goals: 'docker:build docker:push'
-
-    project: 'aai/traversal'
-    stream:
-      - 'amsterdam':
-          branch: 'amsterdam'
-    mvn-settings: 'aai-traversal-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
 - project:
     name: aai-traversal-sonar
     jobs:
       - gerrit-maven-sonar
+    cron: 'H 11 * * *'
     build-node: ubuntu1604-basebuild-4c-4g
-    java-version: ''
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     branch: 'master'