Upgrade to common-packer

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

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 87f3a48..184bf89 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -1,24 +1,16 @@
 ---
 - project:
     name: ci-management-jobs
-    project: 'ci-management'
     jobs:
-      - '{project}-verify-jjb'
-      - '{project}-merge-jjb'
-      - '{project}-verify-packer'
-      - '{project}-merge-packer-{platforms}-{templates}'
+      - '{project-name}-ci-jobs'
 
+    project: 'ci-management'
+    project-name: 'ci-management'
     archive-artifacts: '**/*.log'
     branch: 'master'
     build-timeout: '60'
-    build-node: 'centos7-basebuild-2c-1g'
-
-    platforms:
-      - centos
-      - ubuntu-16.04
-
-    templates:
-      - basebuild
+    build-node: 'centos7-builder-2c-1g'
+    jjb-version: 2.0.0
 
 - job-template:
     name: '{project}-verify-jjb'
@@ -28,11 +20,11 @@
     concurrent: true
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: 14
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: 'master'
           refspec: 'refs/heads/master'
@@ -42,9 +34,10 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -69,9 +62,9 @@
           gzip archives/job_output/*
       - ci-management-check-unicode
 
-#     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     name: '{project}-merge-jjb'
@@ -80,11 +73,11 @@
     node: '{build-node}'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: 14
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: 'master'
           refspec: 'refs/heads/master'
@@ -94,9 +87,10 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -119,89 +113,6 @@
           pip install jenkins-job-builder
           jenkins-jobs --conf $JJBINI update --delete-old --workers 4 jjb/
 
-#     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
-
-- job-template:
-    name: '{project}-verify-packer'
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - ecomp-infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - ecomp-infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - ecomp-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: 'packer/**'
-
-    builders:
-      - packer-validate
-
-#     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
-
-- job-template:
-    name: '{project}-merge-packer-{platforms}-{templates}'
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - ecomp-infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - ecomp-infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-
-    wrappers:
-      - ecomp-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: 'packer/**'
-
-    builders:
-      - packer-validate
-      - packer-build:
-          platform: '{platforms}'
-          template: '{templates}'
-
-#     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'