Merge pull request #1011 from sdodson/sync-examples

Sync db-templates, image-streams, and quickstart-templates

1 files changed, 16 insertions, 6 deletions

diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
index 14bd032af..0b016373f 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
@@ -7,7 +7,7 @@
     "annotations": {
       "description": "Jenkins service, without persistent storage. WARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
       "iconClass": "icon-jenkins",
-      "tags": "database,jenkins"
+      "tags": "instant-app,jenkins"
     }
   },
   "objects": [
@@ -70,6 +70,21 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "jenkins"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "jenkins:latest",
+                "namespace": "openshift"
+              },
+              "lastTriggeredImage": ""
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -133,11 +148,6 @@
       "value": "jenkins"
     },
     {
-      "name": "JENKINS_IMAGE",
-      "description": "Jenkins Docker image to use",
-      "value": "openshift/jenkins-1-centos7"
-    },
-    {
       "name": "JENKINS_PASSWORD",
       "description": "Password for the Jenkins user",
       "generate": "expression",