Sync v3.8 content

roles/openshift_examples/files/examples/v3.8/image-streams/image-streams-rhel7.json

@@ -863,7 +863,7 @@
             },
             "from": {
               "kind": "DockerImage",
-              "name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7:latest"
+              "name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7:v3.8"
             }
           }
         ]

roles/openshift_examples/files/examples/v3.8/xpaas-streams/fis-image-streams.json

@@ -15,16 +15,19 @@
                 "name": "fis-java-openshift"
             },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-fuse-6/fis-java-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "JBoss Fuse Integration Services 1.0 Java S2I images.",
                             "iconClass": "icon-jboss",
-                            "tags": "builder,jboss-fuse,java,xpaas",
+                            "tags": "builder,jboss-fuse,java,xpaas,hidden",
                             "supports":"jboss-fuse:6.2.1,java:8,xpaas:1.2",
                             "version": "1.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-fuse-6/fis-java-openshift:1.0"
                         }
                     },
                     {
@@ -35,6 +38,10 @@
                             "tags": "builder,jboss-fuse,java,xpaas",
                             "supports":"jboss-fuse:6.3.0,java:8,xpaas:1.2",
                             "version": "2.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-fuse-6/fis-java-openshift:2.0"
                         }
                     }
                 ]
@@ -47,16 +54,19 @@
                 "name": "fis-karaf-openshift"
             },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-fuse-6/fis-karaf-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "JBoss Fuse Integration Services 1.0 Karaf S2I images.",
                             "iconClass": "icon-jboss",
-                            "tags": "builder,jboss-fuse,java,karaf,xpaas",
+                            "tags": "builder,jboss-fuse,java,karaf,xpaas,hidden",
                             "supports":"jboss-fuse:6.2.1,java:8,xpaas:1.2",
                             "version": "1.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-fuse-6/fis-karaf-openshift:1.0"
                         }
                     },
                     {
@@ -67,6 +77,10 @@
                             "tags": "builder,jboss-fuse,java,karaf,xpaas",
                             "supports":"jboss-fuse:6.3.0,java:8,xpaas:1.2",
                             "version": "2.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-fuse-6/fis-karaf-openshift:2.0"
                         }
                     }
                 ]

roles/openshift_examples/files/examples/v3.8/xpaas-templates/karaf2-camel-amq-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "Camel route using ActiveMQ in Karaf container. This quickstart shows how to use Camel in a Karaf Container using Blueprint to connect to the A-MQ xPaaS message broker on OpenShift that should already be installed, one simple way to run a A-MQ service is following the documentation of the A-MQ xPaaS image for OpenShift related to the amq63-basic template.",
-      "tags": "quickstart,java,karaf,fis",
+      "tags": "quickstart,java,karaf,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/karaf2-camel-log-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "A simple Camel route in Karaf container. This quickstart shows a simple Apache Camel application that logs a message to the server log every 5th second.",
-      "tags": "quickstart,java,karaf,fis",
+      "tags": "quickstart,java,karaf,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/karaf2-camel-rest-sql-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "Camel example using Rest DSL with SQL Database in Karaf container.  This example demonstrates how to use SQL via JDBC along with Camel's REST DSL to expose a RESTful API. The OpenShift MySQL container image should already be installed and running on your OpenShift installation, one simple way to run a MySQL service is following the documentation of the Openshift MySQL container image related to the mysql-ephemeral template..",
-      "tags": "quickstart,java,karaf,fis",
+      "tags": "quickstart,java,karaf,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/karaf2-cxf-rest-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "REST example using CXF in Karaf container. This quickstart demonstrates how to create a RESTful (JAX-RS) web service using CXF and expose it through the OSGi HTTP Service",
-      "tags": "quickstart,java,karaf,fis",
+      "tags": "quickstart,java,karaf,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/spring-boot-camel-infinispan-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "Spring Boot, Camel and JBoss Data Grid QuickStart. This quickstart demonstrates how to connect a Spring-Boot application to a JBoss Data Grid (or Infinispan) server using the Hot Rod protocol. It requires that the data grid server (or cluster) has been deployed first, one simple way to run a JDG service is following the documentation of the JDG xPaaS image for OpenShift related to the datagrid65-basic template.",
-      "tags": "quickstart,java,springboot,fis",
+      "tags": "quickstart,java,springboot,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/spring-boot-camel-teiid-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "Spring-Boot, Camel and JBoss Data Virtualization QuickStart. This example demonstrates how to connect Apache Camel to a remote JBoss Data Virtualization (or Teiid) Server using the JDBC protocol. This quickstart assumes that the JDV server is already running and configured on OpenShift, more information about to setup a JDV server can be found at https://github.com/fabric8-quickstarts/spring-boot-camel-teiid/blob/fis-2.0.x.redhat/README.redhat.md",
-      "tags": "quickstart,java,springboot,fis",
+      "tags": "quickstart,java,springboot,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/spring-boot-camel-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "Spring-Boot and Camel QuickStart. This example demonstrates how you can use Apache Camel with Spring Boot on Openshift. The quickstart uses Spring Boot to configure a little application that includes a Camel route that triggeres a message every 5th second, and routes the message to a log.",
-      "tags": "quickstart,java,springboot,fis",
+      "tags": "quickstart,java,springboot,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/spring-boot-camel-xml-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "Spring-Boot and Camel Xml QuickStart. This example demonstrates how you can use Apache Camel with Spring Boot on Openshift. The quickstart uses Spring Boot to configure a little application that includes a Camel route (in Spring xml) that triggeres a message every 5th second, and routes the message to a log.",
-      "tags": "quickstart,java,springboot,fis",
+      "tags": "quickstart,java,springboot,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/spring-boot-cxf-jaxrs-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "Spring-Boot and CXF JAXRS QuickStart. This example demonstrates how you can use Apache CXF JAXRS with Spring Boot on Openshift. The quickstart uses Spring Boot to configure a little application that includes a CXF JAXRS endpoint with Swagger enabled.",
-      "tags": "quickstart,java,springboot,fis",
+      "tags": "quickstart,java,springboot,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },

roles/openshift_examples/files/examples/v3.8/xpaas-templates/spring-boot-cxf-jaxws-template.json

@@ -4,7 +4,7 @@
   "metadata": {
     "annotations": {
       "description": "Spring-Boot and CXF JAXWS QuickStart. This example demonstrates how you can use Apache CXF JAXWS with Spring Boot on Openshift. The quickstart uses Spring Boot to configure a little application that includes a CXF JAXWS endpoint.",
-      "tags": "quickstart,java,springboot,fis",
+      "tags": "quickstart,java,springboot,fis,jboss-fuse",
       "iconClass": "icon-jboss",
       "version": "2.0"
     },