From 107ad2c247cc4dc08e5ca6895362c0b49f6feb77 Mon Sep 17 00:00:00 2001
From: Yuxiang Zhu <yuxzhu@redhat.com>
Date: Sep 07 2018 05:38:15 +0000
Subject: CI/CD - Fix app label failing to be applied to waiverdb BuildConfig


There is a syntax error that app label is not correctly applied to waiverdb BuildConfig.

This PR also change the file extension from `yml` to `yaml`.

---

diff --git a/openshift/pipelines/templates/waiverdb-dev.Jenkinsfile b/openshift/pipelines/templates/waiverdb-dev.Jenkinsfile
index 327a046..d748d8e 100644
--- a/openshift/pipelines/templates/waiverdb-dev.Jenkinsfile
+++ b/openshift/pipelines/templates/waiverdb-dev.Jenkinsfile
@@ -213,7 +213,7 @@ pipeline {
             // We have to create a new BuildConfig for each container build.
             // Create a BuildConfig from a seperated Template.
             echo 'Creating a BuildConfig for container build...'
-            def template = readYaml file: 'openshift/waiverdb-container-template.yml'
+            def template = readYaml file: 'openshift/waiverdb-container-template.yaml'
             def processed = openshift.process(template,
               "-p", "NAME=${env.BUILDCONFIG_INSTANCE_ID}",
               '-p', "WAIVERDB_GIT_REPO=${params.WAIVERDB_GIT_REPO}",
diff --git a/openshift/waiverdb-container-template.yaml b/openshift/waiverdb-container-template.yaml
new file mode 100644
index 0000000..09b5a40
--- /dev/null
+++ b/openshift/waiverdb-container-template.yaml
@@ -0,0 +1,82 @@
+# Template to produce a new BuildConfig and ImageStream for WaiverDB container builds.
+
+---
+apiVersion: v1
+kind: Template
+metadata:
+  name: waiverdb-container-template
+labels:
+  template: "waiverdb-container-template"
+parameters:
+- name: NAME
+  displayName: Short unique identifier for the templated instances.
+  required: true
+  value: "waiverdb-container"
+- name: WAIVERDB_GIT_REPO
+  displayName: WaiverDB Git repo URL
+  description: Default WaiverDB Git repo URL in which to run dev tests against
+  required: true
+  value: https://pagure.io/waiverdb.git
+- name: WAIVERDB_GIT_REF
+  displayName: WaiverDB Git repo ref
+  description: Default WaiverDB Git repo ref in which to run dev tests against
+  required: true
+  value: master
+- name: WAIVERDB_IMAGESTREAM_NAME
+  displayName: ImageStream name of the resulting image
+  required: true
+  value: waiverdb
+- name: WAIVERDB_IMAGE_TAG
+  displayName: Tag of resulting image
+  required: true
+  value: latest
+- name: WAIVERDB_IMAGESTREAM_NAMESPACE
+  displayName: Namespace of ImageStream for WaiverDB container images
+  required: false
+- name: WAIVERDB_VERSION
+  displayName: WaiverDB app version
+  required: false
+  value: ''
+objects:
+- apiVersion: v1
+  kind: ImageStream
+  metadata:
+    name: "${WAIVERDB_IMAGESTREAM_NAME}"
+    labels:
+      app: "${NAME}"
+- kind: "BuildConfig"
+  apiVersion: "v1"
+  metadata:
+    name: "${NAME}"
+    labels:
+      app: "${NAME}"
+  spec:
+    runPolicy: "Parallel"
+    completionDeadlineSeconds: 1800
+    strategy:
+      dockerStrategy:
+        forcePull: true
+        buildArgs:
+        - name: "WAIVERDB_GIT_REPO"
+          value: "${WAIVERDB_GIT_REPO}"
+        - name: "WAIVERDB_GIT_REF"
+          value: "${WAIVERDB_GIT_REF}"
+        - name: "WAIVERDB_VERSION"
+          value: "${WAIVERDB_VERSION}"
+        dockerfilePath: openshift/containers/waiverdb/Dockerfile
+    resources:
+      requests:
+        memory: "768Mi"
+        cpu: "300m"
+      limits:
+       memory: "1Gi"
+       cpu: "500m"
+    source:
+      git:
+        uri: "${WAIVERDB_GIT_REPO}"
+        ref: "${WAIVERDB_GIT_REF}"
+    output:
+      to:
+        kind: "ImageStreamTag"
+        name: "${WAIVERDB_IMAGESTREAM_NAME}:${WAIVERDB_IMAGE_TAG}"
+        namespace: "${WAIVERDB_IMAGESTREAM_NAMESPACE}"
diff --git a/openshift/waiverdb-container-template.yml b/openshift/waiverdb-container-template.yml
deleted file mode 100644
index 06f434f..0000000
--- a/openshift/waiverdb-container-template.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-# Template to produce a new BuildConfig and ImageStream for WaiverDB container builds.
-
----
-apiVersion: v1
-kind: Template
-metadata:
-  name: waiverdb-container-template
-labels:
-  template: "waiverdb-container-template"
-parameters:
-- name: NAME
-  displayName: Short unique identifier for the templated instances.
-  required: true
-  value: "waiverdb-container"
-- name: WAIVERDB_GIT_REPO
-  displayName: WaiverDB Git repo URL
-  description: Default WaiverDB Git repo URL in which to run dev tests against
-  required: true
-  value: https://pagure.io/waiverdb.git
-- name: WAIVERDB_GIT_REF
-  displayName: WaiverDB Git repo ref
-  description: Default WaiverDB Git repo ref in which to run dev tests against
-  required: true
-  value: master
-- name: WAIVERDB_IMAGESTREAM_NAME
-  displayName: ImageStream name of the resulting image
-  required: true
-  value: waiverdb
-- name: WAIVERDB_IMAGE_TAG
-  displayName: Tag of resulting image
-  required: true
-  value: latest
-- name: WAIVERDB_IMAGESTREAM_NAMESPACE
-  displayName: Namespace of ImageStream for WaiverDB container images
-  required: false
-- name: WAIVERDB_VERSION
-  displayName: WaiverDB app version
-  required: false
-  value: ''
-objects:
-- apiVersion: v1
-  kind: ImageStream
-  metadata:
-    name: "${WAIVERDB_IMAGESTREAM_NAME}"
-    labels:
-      app: "${NAME}"
-- kind: "BuildConfig"
-  apiVersion: "v1"
-  metadata:
-    name: "${NAME}"
-    metadata:
-      labels:
-        app: "${NAME}"
-  spec:
-    runPolicy: "Parallel"
-    completionDeadlineSeconds: 1800
-    strategy:
-      dockerStrategy:
-        forcePull: true
-        buildArgs:
-        - name: "WAIVERDB_GIT_REPO"
-          value: "${WAIVERDB_GIT_REPO}"
-        - name: "WAIVERDB_GIT_REF"
-          value: "${WAIVERDB_GIT_REF}"
-        - name: "WAIVERDB_VERSION"
-          value: "${WAIVERDB_VERSION}"
-        dockerfilePath: openshift/containers/waiverdb/Dockerfile
-    resources:
-      requests:
-        memory: "768Mi"
-        cpu: "300m"
-      limits:
-       memory: "1Gi"
-       cpu: "500m"
-    source:
-      git:
-        uri: "${WAIVERDB_GIT_REPO}"
-        ref: "${WAIVERDB_GIT_REF}"
-    output:
-      to:
-        kind: "ImageStreamTag"
-        name: "${WAIVERDB_IMAGESTREAM_NAME}:${WAIVERDB_IMAGE_TAG}"
-        namespace: "${WAIVERDB_IMAGESTREAM_NAMESPACE}"