From b08257928a77a501a4312daee8f3589103da8b02 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Tue, 1 Sep 2015 15:44:17 -0400
Subject: Jenkins image was renamed

---
 .../examples/image-streams/image-streams-centos7.json      | 14 +++++++-------
 .../files/examples/image-streams/image-streams-rhel7.json  |  4 ++--
 .../quickstart-templates/jenkins-ephemeral-template.json   |  7 ++++++-
 .../quickstart-templates/jenkins-persistent-template.json  |  7 ++++++-
 4 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'roles/openshift_examples')

diff --git a/roles/openshift_examples/files/examples/image-streams/image-streams-centos7.json b/roles/openshift_examples/files/examples/image-streams/image-streams-centos7.json
index 03affbddf..f213d99ca 100644
--- a/roles/openshift_examples/files/examples/image-streams/image-streams-centos7.json
+++ b/roles/openshift_examples/files/examples/image-streams/image-streams-centos7.json
@@ -161,19 +161,19 @@
         "creationTimestamp": null
       },
       "spec": {
-        "dockerImageRepository": "openshift/wildfly-8-centos",
+        "dockerImageRepository": "openshift/wildfly-81-centos7",
         "tags": [
           {
             "name": "latest"
           },
           {
-            "name": "8",
+            "name": "8.1",
             "annotations": {
-              "description": "Build and run Java applications on Wildfly 8",
+              "description": "Build and run Java applications on Wildfly 8.1",
               "iconClass": "icon-wildfly",
               "tags": "builder,wildfly,java",
-              "supports":"wildfly:8,jee,java",
-              "version": "8"
+              "supports":"wildfly:8.1,jee,java",
+              "version": "8.1"
             },
             "from": {
               "Kind": "ImageStreamTag",
@@ -260,13 +260,13 @@
         "creationTimestamp": null
       },
       "spec": {
-        "dockerImageRepository": "openshift/jenkins-16-centos7",
+        "dockerImageRepository": "openshift/jenkins-1-centos7",
         "tags": [
           {
             "name": "latest"
           },
           {
-            "name": "1.6",
+            "name": "1",
             "from": {
               "Kind": "ImageStreamTag",
               "Name": "latest"
diff --git a/roles/openshift_examples/files/examples/image-streams/image-streams-rhel7.json b/roles/openshift_examples/files/examples/image-streams/image-streams-rhel7.json
index 0bd885af3..8c125f76a 100644
--- a/roles/openshift_examples/files/examples/image-streams/image-streams-rhel7.json
+++ b/roles/openshift_examples/files/examples/image-streams/image-streams-rhel7.json
@@ -230,13 +230,13 @@
         "creationTimestamp": null
       },
       "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/jenkins-16-rhel7",
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/jenkins-1-rhel7",
         "tags": [
           {
             "name": "latest"
           },
           {
-            "name": "1.6",
+            "name": "1",
             "from": {
               "Kind": "ImageStreamTag",
               "Name": "latest"
diff --git a/roles/openshift_examples/files/examples/quickstart-templates/jenkins-ephemeral-template.json b/roles/openshift_examples/files/examples/quickstart-templates/jenkins-ephemeral-template.json
index da08ffbd5..14bd032af 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/jenkins-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/jenkins-ephemeral-template.json
@@ -88,7 +88,7 @@
             "containers": [
               {
                 "name": "jenkins",
-                "image": "openshift/jenkins-16-centos7",
+                "image": "${JENKINS_IMAGE}",
                 "env": [
                   {
                     "name": "JENKINS_PASSWORD",
@@ -132,6 +132,11 @@
       "description": "Jenkins service name",
       "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",
diff --git a/roles/openshift_examples/files/examples/quickstart-templates/jenkins-persistent-template.json b/roles/openshift_examples/files/examples/quickstart-templates/jenkins-persistent-template.json
index 33df68c74..fa31de486 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/jenkins-persistent-template.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/jenkins-persistent-template.json
@@ -105,7 +105,7 @@
             "containers": [
               {
                 "name": "jenkins",
-                "image": "openshift/jenkins-16-centos7",
+                "image": "${JENKINS_IMAGE}",
                 "env": [
                   {
                     "name": "JENKINS_PASSWORD",
@@ -155,6 +155,11 @@
       "generate": "expression",
       "value": "password"
     },
+    {
+      "name": "JENKINS_IMAGE",
+      "description": "Jenkins Docker image to use",
+      "value": "openshift/jenkins-1-centos7"
+    },
     {
       "name": "VOLUME_CAPACITY",
       "description": "Volume space available for data, e.g. 512Mi, 2Gi",
-- 
cgit v1.2.3