Merge "Remove deprecated clamp jobs"

[ci-management.git] / jjb / clamp / clamp.yaml

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index dd55613..901d844 100644 (file)
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -9,28 +9,28 @@
     name: clamp
     project-name: 'clamp'
     jobs:
+      - gerrit-maven-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
       - '{project-name}-{stream}-verify-java-checkstyle':
          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-merge-properties-java':
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         setVersion: 'DoSetVersion'
-         mvn_properties:
-          - docker.pull.registry=nexus3.onap.org:10001
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         setVersion: 'DoSetVersion'
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-Dmaven.test.skip=true'
-         maven-properties: |
-          clamp.registry=$
 
     project: 'clamp'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
+        - 'dublin':
+              branch: 'dublin'
     mvn-settings: 'clamp-settings'
     files: '**'
     archive-artifacts: ''
@@ -55,10 +55,18 @@
     jobs:
       - gerrit-maven-clm:
          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    nexus-iq-namespace: 'onap-'
     project: 'clamp'
     project-name: 'clamp'
     branch: 'master'
     mvn-settings: 'clamp-settings'
     build-node: ubuntu1604-docker-8c-8g
-    build-timeout: 90
+    build-timeout: 120
 
+- project:
+    name: clamp-info
+    project-name: clamp
+    jobs:
+      - gerrit-info-yaml-verify
+    project: clamp
+    branch: master