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 141731b..184bf89 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -3,28 +3,14 @@
     name: ci-management-jobs
     jobs:
       - '{project-name}-ci-jobs'
-      - '{project}-verify-packer'
-      - '{project}-merge-packer-{platforms}-{templates}'
 
     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
-      - docker
-      - redis
-
-    exclude:
-      # only build the docker image on ubuntu at present
-      - platforms: centos
-        templates: docker
+    build-node: 'centos7-builder-2c-1g'
+    jjb-version: 2.0.0
 
 - job-template:
     name: '{project}-verify-jjb'
@@ -130,87 +116,3 @@
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
-
-- job-template:
-    name: '{project}-verify-packer'
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: 'packer/**'
-
-    builders:
-      - packer-validate
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-- job-template:
-    name: '{project}-merge-packer-{platforms}-{templates}'
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - 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:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'