From 4ffbfcba2b309056c462c53e4a11908b7cc9c487 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 23 Aug 2017 22:12:20 -0700
Subject: Move packer jobs into global-jjb

Remove old packer verify and merge jobs and
switch into using the ones from global-jjb

Change-Id: Ie1bf73a9b2154f7074a91051df4be12d6d41df8f
Issue-id: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 jjb/ci-management/ci-management-macros.yaml      |  22 -----
 jjb/ci-management/ci-management.yaml             | 101 +++--------------------
 jjb/ci-management/raw-include-packer-validate.sh |  19 -----
 3 files changed, 12 insertions(+), 130 deletions(-)
 delete mode 100644 jjb/ci-management/ci-management-macros.yaml
 delete mode 100644 jjb/ci-management/raw-include-packer-validate.sh

diff --git a/jjb/ci-management/ci-management-macros.yaml b/jjb/ci-management/ci-management-macros.yaml
deleted file mode 100644
index e79cf8a23..000000000
--- a/jjb/ci-management/ci-management-macros.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# vim: sw=2 ts=2 sts=2 et :
-- builder:
-    name: packer-validate
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'packer-cloud-env'
-              variable: 'CLOUDENV'
-      - shell: !include-raw: raw-include-packer-validate.sh
-
-- builder:
-    name: packer-build
-    builders:
-      - shell: |
-          cd packer
-          export PACKER_LOG="yes"
-          export PACKER_LOG_PATH="packer-build.log"
-          packer.io build -color=false \
-            -var-file=$CLOUDENV \
-            -var-file=vars/{platform}.json \
-            templates/{template}.json
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index c8ebc634e..c1dea93fe 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -3,8 +3,6 @@
     name: ci-management-jobs
     jobs:
       - '{project-name}-ci-jobs'
-      - '{project}-verify-packer'
-      - '{project}-merge-packer-{platforms}-{templates}'
 
     project: 'ci-management'
     project-name: 'ci-management'
@@ -12,16 +10,25 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-basebuild-2c-1g'
+
+- project:
+    name: packer-jobs
+    # packer jobs templates are defined in global-jjb
+    jobs:
+      - '{project-name}-packer-jobs'
+    project: 'ci-management'
+    project-name: 'ci-management'
+    branch: master
+    archive-artifacts: '**/*.log'
+    build-node: 'centos7-basebuild-2c-1g'
     platforms:
       - centos
       - ubuntu-16.04
-
     templates:
       - basebuild
       - docker
-      - redis
       - memcached
-
+      - redis
     exclude:
       # only build the docker image on ubuntu at present
       - platforms: centos
@@ -131,87 +138,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}'
diff --git a/jjb/ci-management/raw-include-packer-validate.sh b/jjb/ci-management/raw-include-packer-validate.sh
deleted file mode 100644
index 01984dd7a..000000000
--- a/jjb/ci-management/raw-include-packer-validate.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-cd packer
-varfiles="../packer/vars/*"
-templates="../packer/templates/*"
-provision="../packer/provision/*.sh"
-for v in $varfiles; do
-  [[ "${v##*/}" =~ ^(cloud-env.*)$ ]] && continue
-  for t in $templates; do
-  export PACKER_LOG="yes" && \
-  export PACKER_LOG_PATH="packer-validate-${v##*/}-${t##*/}.log" && \
-          packer.io validate -var-file=$CLOUDENV \
-          -var-file=$v $t
-  if [ $? -ne 0 ]; then
-      break
-  fi
-  done
-done
-for p in $provision; do
-  /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1
-done
-- 
cgit 1.2.3-korg