diff --git a/tests/arq/pom.xml b/tests/arq/pom.xml deleted file mode 100644 index 89bff532..00000000 --- a/tests/arq/pom.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - 4.0.0 - - - org.jboss - jboss-parent - 25 - - - org.jboss.ce.testsuite - openjdk-arq-testsuite - jar - OpenJDK 1.8 testsuite - 1.0-SNAPSHOT - Arquillian OpenJDK 1.8 testsuite - - - 1.4.0.Final - 1.16.0 - 1.1.1 - 4.13.1 - 2.1.1.Final - 2.1.4.Final - 3.7.9.Final - 3.11.0 - - registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.6 - 8 - java - - - - - - org.jboss.arquillian - arquillian-bom - ${version.arquillian} - pom - import - - - - org.arquillian.cube - arquillian-cube-bom - ${version.arquillian.cube} - import - pom - - - - - - - com.squareup.okhttp3 - okhttp - ${version.okhttp} - - - - com.googlecode.json-simple - json-simple - ${version.json-simple} - - - - org.arquillian.cube - arquillian-cube-openshift - ${version.arquillian.cube} - test - - - - org.jboss.arquillian.junit - arquillian-junit-container - ${version.arquillian} - test - - - - org.jboss.xnio - xnio-nio - ${version.xnio} - test - - - - org.jboss.xnio - xnio-api - ${version.xnio} - test - - - - org.jboss.arquillian.protocol - arquillian-protocol-jmx - ${version.arquillian} - test - - - - org.wildfly.arquillian - wildfly-arquillian-container-remote - ${version.wildfly.arquillian} - test - - - - org.jboss.logmanager - jboss-logmanager - ${version.jboss.logmanager} - - - - junit - junit - ${version.junit} - test - - - - - - - arch-ppc64le - - - - org.apache.maven.plugins - maven-surefire-plugin - - - 2 - - - org/jboss/**/*Postgresql*Test.java - - - testrunner-pod-ppc64le.json - - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-dependencies - process-test-classes - - unpack-dependencies - - - org.jboss - test-jar - test - ${project.build.directory}/test-classes - false - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - alphabetical - true - false - 4 - false - - org/jboss/**/*Test.java - - - - cloudapps.example.com - - dns,ArquillianCubeNameService - - default - ${kubernetes.master} - ${kubernetes.auth.token} - ${router.hostIP} - ${image} - ${image.stream.name} - ${image.stream.version} - jboss-openshift - testrunner-pod.json - master - - - https://raw.githubusercontent.com/openshift/origin/v3.10.0/examples/image-streams/image-streams-rhel7.json - - - - - - - diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/common/Libraries.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/common/Libraries.java deleted file mode 100644 index 93f16f14..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/common/Libraries.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2015 Red Hat Inc. and/or its affiliates and other - * contributors as indicated by the @author tags. All rights reserved. - * See the copyright.txt in the distribution for a full listing of - * individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.test.arquillian.ce.common; - -import java.io.File; - -import org.jboss.shrinkwrap.resolver.api.maven.Maven; - -/** - * @author Ales Justin - */ -public class Libraries { - public interface PomStrategy { - String[] profiles(); - - String toPom(); - } - - public static final PomStrategy MAVEN = new PomStrategy() { - @Override - public String[] profiles() { - final String profiles = System.getProperty("cearq.maven.profiles"); - if (profiles == null) { - return null; - } - return profiles.split(","); - } - - @Override - public String toPom() { - return "pom.xml"; - } - }; - - public static File[] single(String groupId, String artifactId) { - return single(MAVEN, groupId, artifactId); - } - - public static File[] single(PomStrategy pomStrategy, String groupId, String artifactId) { - return Maven.resolver().loadPomFromFile(pomStrategy.toPom(), pomStrategy.profiles()).resolve(groupId + ":" + artifactId).withoutTransitivity().asFile(); - } - - public static File[] transitive(String groupId, String artifactId) { - return transitive(MAVEN, groupId, artifactId); - } - - public static File[] transitive(PomStrategy pomStrategy, String groupId, String artifactId) { - return Maven.resolver().loadPomFromFile(pomStrategy.toPom(), pomStrategy.profiles()).resolve(groupId + ":" + artifactId).withTransitivity().asFile(); - } -} diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/common/UnsafeOkHttpClient.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/common/UnsafeOkHttpClient.java deleted file mode 100644 index 456ee6cc..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/common/UnsafeOkHttpClient.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.jboss.test.arquillian.ce.common; - -import okhttp3.OkHttpClient; - -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.security.cert.CertificateException; - -/** - * https://futurestud.io/tutorials/retrofit-2-how-to-trust-unsafe-ssl-certificates-self-signed-expired - */ -public class UnsafeOkHttpClient { - public static OkHttpClient getUnsafeOkHttpClient() { - try { - /* Create a trust manager that does not validate certificate chains */ - final TrustManager[] trustAllCerts = new TrustManager[]{ - new X509TrustManager() { - @Override - public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException { - } - - @Override - public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException { - } - - @Override - public java.security.cert.X509Certificate[] getAcceptedIssuers() { - return new java.security.cert.X509Certificate[]{}; - } - } - }; - - // Install the all-trusting trust manager - final SSLContext sslContext = SSLContext.getInstance("SSL"); - sslContext.init(null, trustAllCerts, new java.security.SecureRandom()); - - // Create an ssl socket factory with our all-trusting manager - final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); - - OkHttpClient.Builder builder = new OkHttpClient.Builder(); - builder.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0]); - builder.hostnameVerifier(new HostnameVerifier() { - @Override - public boolean verify(String hostname, SSLSession session) { - return true; - } - }); - - OkHttpClient okHttpClient = builder.build(); - return okHttpClient; - } catch (Exception e) { - throw new RuntimeException(e); - } - } -} \ No newline at end of file diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKDatabaseTest.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKDatabaseTest.java deleted file mode 100644 index 328f9b28..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKDatabaseTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.jboss.test.arquillian.ce.openjdk; - -import org.arquillian.cube.openshift.api.OpenShiftHandle; -import org.arquillian.cube.openshift.impl.enricher.RouteURL; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Test; - -import java.net.URL; -import java.util.logging.Logger; - -public abstract class OpenJDKDatabaseTest extends OpenJDKTest { - - private Logger log = Logger.getLogger(getClass().getName()); - - @ArquillianResource - OpenShiftHandle adapter; - - private final String NAME = "John"; - private final String NUMBER = "0123456789"; - private final String INSERT = "Stored " + NUMBER + " for " + NAME; - private final String RETRIEVE = "Number for " + NAME + " is " + NUMBER; - - protected boolean persistent; - protected String driver; - - @RouteURL("openjdk-app") - private URL url; - - @Test - @RunAsClient - public void testRoute() throws Exception { - String insert = url.toString() + "/?name=" + NAME + "&number=" + NUMBER; - checkResponse(insert, INSERT); - if (persistent) { - restartPod("openjdk-app-" + driver); - } - String retrieve = url.toString() + "/?name=" + NAME; - checkResponse(retrieve, RETRIEVE); - } - - private void restartPod(String name) throws Exception { - log.info("Scaling down " + name); - adapter.scaleDeployment(name, 0); - log.info("Scaling up " + name); - adapter.scaleDeployment(name, 1); - } -} \ No newline at end of file diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKMysqlPersistentTest.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKMysqlPersistentTest.java deleted file mode 100644 index 4ec95ee9..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKMysqlPersistentTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jboss.test.arquillian.ce.openjdk; - -import org.arquillian.cube.openshift.api.OpenShiftResource; -import org.arquillian.cube.openshift.api.Template; -import org.arquillian.cube.openshift.api.TemplateParameter; -import org.jboss.arquillian.junit.Arquillian; -import org.junit.runner.RunWith; - -@RunWith(Arquillian.class) -@Template(url = "file://${user.dir}/src/test/resources/openjdk18-mysql-persistent-s2i.json", - parameters = { - @TemplateParameter(name = "IMAGE_STREAM_NAMESPACE", value = "${kubernetes.namespace:openshift}") - } -) -@OpenShiftResource("classpath:openjdk-app-secret.json") -public class OpenJDKMysqlPersistentTest extends OpenJDKDatabaseTest { - - public OpenJDKMysqlPersistentTest() { - this.persistent = true; - this.driver = "mysql"; - } -} diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKMysqlTest.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKMysqlTest.java deleted file mode 100644 index 60eb0152..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKMysqlTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jboss.test.arquillian.ce.openjdk; - -import org.arquillian.cube.openshift.api.OpenShiftResource; -import org.arquillian.cube.openshift.api.Template; -import org.arquillian.cube.openshift.api.TemplateParameter; -import org.jboss.arquillian.junit.Arquillian; -import org.junit.runner.RunWith; - -@RunWith(Arquillian.class) -@Template(url = "file://${user.dir}/src/test/resources/openjdk18-mysql-s2i.json", - parameters = { - @TemplateParameter(name = "IMAGE_STREAM_NAMESPACE", value = "${kubernetes.namespace:openshift}") - } -) -@OpenShiftResource("classpath:openjdk-app-secret.json") -public class OpenJDKMysqlTest extends OpenJDKDatabaseTest { - - public OpenJDKMysqlTest() { - this.persistent = false; - this.driver = "mysql"; - } -} diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKPostgresqlPersistentTest.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKPostgresqlPersistentTest.java deleted file mode 100644 index 0b3fef54..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKPostgresqlPersistentTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jboss.test.arquillian.ce.openjdk; - -import org.arquillian.cube.openshift.api.OpenShiftResource; -import org.arquillian.cube.openshift.api.Template; -import org.arquillian.cube.openshift.api.TemplateParameter; -import org.jboss.arquillian.junit.Arquillian; -import org.junit.runner.RunWith; - -@RunWith(Arquillian.class) -@Template(url = "file://${user.dir}/src/test/resources/openjdk18-postgresql-persistent-s2i.json", - parameters = { - @TemplateParameter(name = "IMAGE_STREAM_NAMESPACE", value = "${kubernetes.namespace:openshift}") - } -) -@OpenShiftResource("classpath:openjdk-app-secret.json") -public class OpenJDKPostgresqlPersistentTest extends OpenJDKDatabaseTest { - - public OpenJDKPostgresqlPersistentTest() { - this.persistent = true; - this.driver = "postgresql"; - } -} diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKPostgresqlTest.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKPostgresqlTest.java deleted file mode 100644 index 5cdcc148..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKPostgresqlTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jboss.test.arquillian.ce.openjdk; - -import org.arquillian.cube.openshift.api.OpenShiftResource; -import org.arquillian.cube.openshift.api.Template; -import org.arquillian.cube.openshift.api.TemplateParameter; -import org.jboss.arquillian.junit.Arquillian; -import org.junit.runner.RunWith; - -@RunWith(Arquillian.class) -@Template(url = "file://${user.dir}/src/test/resources/openjdk18-postgresql-s2i.json", - parameters = { - @TemplateParameter(name = "IMAGE_STREAM_NAMESPACE", value = "${kubernetes.namespace:openshift}") - } -) -@OpenShiftResource("classpath:openjdk-app-secret.json") -public class OpenJDKPostgresqlTest extends OpenJDKDatabaseTest { - - public OpenJDKPostgresqlTest() { - this.persistent = false; - this.driver = "postgresql"; - } -} diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKTest.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKTest.java deleted file mode 100644 index 08c3c6f0..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKTest.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.jboss.test.arquillian.ce.openjdk; - -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.arquillian.cube.openshift.api.OpenShiftDynamicImageStreamResource; -import org.arquillian.cube.openshift.api.OpenShiftResource; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.logmanager.Level; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.test.arquillian.ce.common.Libraries; -import org.jboss.test.arquillian.ce.common.UnsafeOkHttpClient; -import org.junit.Assert; - -import java.util.logging.Logger; - -@OpenShiftResource("${openshift.imageStreams}") -@OpenShiftDynamicImageStreamResource(name = "${image.stream.name}", image = "${image.stream.image}", version = "${image.stream.version}") -public abstract class OpenJDKTest { - - private Logger log = Logger.getLogger(getClass().getName()); - - @Deployment - public static WebArchive getDeployment() { - WebArchive war = ShrinkWrap.create(WebArchive.class, "run-in-pod.war"); - war.setWebXML(new StringAsset("")); - war.addClass(OpenJDKTest.class); - war.addClass(OpenJDKWebBasicTest.class); - war.addClass(UnsafeOkHttpClient.class); - war.addAsLibraries(Libraries.transitive("com.squareup.okhttp3", "okhttp")); - war.addAsLibraries(Libraries.transitive("org.jboss.logmanager", "jboss-logmanager")); - return war; - } - - protected void checkResponse(String url, String expected) throws Exception { - OkHttpClient client = UnsafeOkHttpClient.getUnsafeOkHttpClient(); - - Request request = new Request.Builder() - .url(url) - .build(); - - Response response = client.newCall(request).execute(); - String responseString = response.body().string(); - - log.log(Level.INFO, responseString); - Assert.assertNotNull(responseString); - Assert.assertEquals(expected, responseString); - } - -} diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKWebBasicTest.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKWebBasicTest.java deleted file mode 100644 index 87d12e28..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKWebBasicTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.jboss.test.arquillian.ce.openjdk; - -import org.arquillian.cube.openshift.api.Template; -import org.arquillian.cube.openshift.api.TemplateParameter; -import org.arquillian.cube.openshift.impl.enricher.RouteURL; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.net.URL; - -@RunWith(Arquillian.class) -@Template(url = "https://raw.githubusercontent.com/${template.repository:jboss-openshift}/application-templates/${template.branch:master}/openjdk/openjdk18-web-basic-s2i.json", - parameters = { - @TemplateParameter(name = "IMAGE_STREAM_NAMESPACE", value = "${kubernetes.namespace:openshift}") - } -) -public class OpenJDKWebBasicTest extends OpenJDKTest { - private final String MSG = "Hello World"; - - @Test - @RunAsClient - public void testRoute(@RouteURL("openjdk-app") URL url) throws Exception { - checkResponse(url.toString(), MSG); - } - - @Test - public void testService() throws Exception { - String host = System.getenv("OPENJDK_APP_SERVICE_HOST"); - int port = Integer.parseInt(System.getenv("OPENJDK_APP_SERVICE_PORT")); - String url = "http://" + host + ":" + port; - checkResponse(url, MSG); - } -} diff --git a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKWebSecureTest.java b/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKWebSecureTest.java deleted file mode 100644 index 04ff0ccf..00000000 --- a/tests/arq/src/test/java/org/jboss/test/arquillian/ce/openjdk/OpenJDKWebSecureTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.jboss.test.arquillian.ce.openjdk; - -import org.arquillian.cube.openshift.api.OpenShiftResource; -import org.arquillian.cube.openshift.api.Template; -import org.arquillian.cube.openshift.api.TemplateParameter; -import org.arquillian.cube.openshift.impl.enricher.RouteURL; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.net.URL; - -@RunWith(Arquillian.class) -@Template(url = "file://${user.dir}/src/test/resources/openjdk18-web-https-s2i.json", - parameters = { - @TemplateParameter(name = "IMAGE_STREAM_NAMESPACE", value = "${kubernetes.namespace:openshift}"), - @TemplateParameter(name = "HTTPS_NAME", value = "jboss"), - @TemplateParameter(name = "HTTPS_PASSWORD", value = "mykeystorepass")}) -@OpenShiftResource("classpath:openjdk-app-secret.json") -public class OpenJDKWebSecureTest extends OpenJDKTest { - private final String MSG = "Hello World"; - - @Test - @RunAsClient - public void testSecureRoute(@RouteURL("secure-openjdk-app") URL url) throws Exception { - checkResponse(url.toString(), MSG); - } - - @Test - public void testSecureService() throws Exception { - String host = System.getenv("SECURE_OPENJDK_APP_SERVICE_HOST"); - int port = Integer.parseInt(System.getenv("SECURE_OPENJDK_APP_SERVICE_PORT")); - String url = "https://" + host + ":" + port; - checkResponse(url, MSG); - } -} diff --git a/tests/arq/src/test/resources/arquillian.xml b/tests/arq/src/test/resources/arquillian.xml deleted file mode 100644 index 5713d97d..00000000 --- a/tests/arq/src/test/resources/arquillian.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - arq-openjdk - src/test/resources/${arquillian.testrunner.file} - testrunner:9999,testrunner:9990,testrunner:8080 - - true - - - - - - admin - Admin#70365 - - - - diff --git a/tests/arq/src/test/resources/log4j.properties b/tests/arq/src/test/resources/log4j.properties deleted file mode 100644 index c8388243..00000000 --- a/tests/arq/src/test/resources/log4j.properties +++ /dev/null @@ -1,17 +0,0 @@ -#Log to Console as STDOUT -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n -#Log to file FILE -log4j.appender.file=org.apache.log4j.DailyRollingFileAppender -log4j.appender.file.File=logfile.log -log4j.appender.file.DatePattern='.'yyyy-MM-dd -log4j.appender.file.append=true -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n - -#Root Logger -log4j.rootLogger=INFO, stdout - -log4j.logger.org.apache.http.wire=INFO diff --git a/tests/arq/src/test/resources/openjdk-app-secret.json b/tests/arq/src/test/resources/openjdk-app-secret.json deleted file mode 100644 index a9093b63..00000000 --- a/tests/arq/src/test/resources/openjdk-app-secret.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "annotations": { - "description": "Examples that can be installed into your project to allow you to test the EAP template. You should replace the contents with data that is more appropriate for your deployment." - } - }, - "labels": { - "template": "openjdk-app-secret" - }, - "items": [ - { - "kind": "ServiceAccount", - "apiVersion": "v1", - "metadata": { - "name": "openjdk-service-account" - }, - "secrets": [ - { - "name": "openjdk-app-secret" - } - ] - }, - { - "kind": "Secret", - "apiVersion": "v1", - "metadata": { - "annotations": { - "description": "Default HTTPS keystore (keystore.jks) with name 'jboss' and password 'mykeystorepass' and JGoups keystore (jgroups.jceks) with name 'secret-key' and password 'password'" - }, - "name": "openjdk-app-secret" - }, - "data": { - "keystore.jks": "/u3+7QAAAAIAAAABAAAAAQAFamJvc3MAAAFVFbYp5AAABQIwggT+MA4GCisGAQQBKgIRAQEFAASCBOqe/lTeehnds9ffJp/EYKY2K7o9CvvyvgiqvdaGqiZxwWjmoYBEuBxJBUkr7uyYr2g3Viui18djJh9paWdBfPRCEWsLxbMBmig+5OXe1U536PTNZlzkdrwSJpusiwwWLiog/kQ+Gp82VzHxsueNVkewKZ6LvdAq+5Pw7148cxgfnm+2j0La1YnX4/TAtY6A33HjU3HxPxpkLCBP66THxjJvm+n5xg+6eAPu6n/c3mWShhudf0k7FAHLgqMqZt22GMlIv73azdz5kf+opcF8nHN/SDnrgmBbX+GBFvMQ64a3zfLGMnCH8R7L2v5K0uH4AvOHHU9+g7KGk/obPOFyqjloPGIGwzyX4UhxsxP9+wU45RVg02SdoOsqsKYeF7JV1t+uj1+WXDkEaxGYx9u5bFIpkQOuuh6kyf6P6MK8gP6u8cRJeLU/LZCkNMSHq6afbgu/Uu0ZlPFKMLBiX6aKYO0nhp/h3QBzLOVCrWB5nnj90WnZ6Ug8bUjozTTKcdOu8oU47cOesSxPsZzs/KXEuqNP+T34fb4iOKjDXpTZDhIDYanfXb+GMHi/XdY5Q5Xu5w+6ES4ue9grlqfXtMa3G/FgUuJ6dLIXCDAHtS6nxvN3VBd3+pkQKG3iiBMbmBSg03bau5stsD8ol6NGQkoqIhvr1cxFHz+wVzh3UE6FOF+T96rqSuK17UNWnNTSFntHpMYUq+CbD1sTsAmaZ1tIbWBVYEw9G0hpzfFgIqndnEOJ2hD1Z30cStVvSamTlY1hYwxw9/qVUGxzRyQF1a4U8wuYyJNSLZmLwF4jmtkP/kvzhOJ9nr9ZHpuZcW8v5OuHpeTGb+bq+23T+1w0uK3x+O0TnZAFKN4UyZN6JWH2LI+jS+95sTt1fgV1gpY7/qtgX26BWPGQw6+ynRT68EREneUH7c8z3W8mkyfeOl+ffi3n4BYmkki6feSJNbkNdRncpFO83qIk3EtE9RNOMjU1ih8w+KrzZXm2LIINYqc6FkR+tACeGcJwPRkv7paGE3fI7JacYPrJsIf8C055NqbW1HFhplhY/zTbSuGH0SaseZ2lzkGVaVG8pzsNBlBX8eR4oL7LWAXhos1uJdg9cVIC2UZ+bBkBlUpEeWi7LryLL+Glg//iMp3W93nm+S6UJVUipVMgCMgHrXZjWQN0tGvPOxBUIM5IrxcrWsjEA0OJDsa0KCbI8R397FP3QZqB9hJPDs6Lb+64XGmkmAixLYLP2LczlmmoJ6pnGTdzqGjf/au1FzTq/Pikundn47Lt0ZsA9D5Wq958zr0U8Zc3X2OewAd/MKh7u5TOAJs870wHZPIjZss9lTwYJ1VfCP9/x4c8wfoas1mLrxoaTx4axIiTn8bMK60fq5s2DLpnDNgGS0g2tsyqw6+BPCKuwNj1dc5dl0fupIZxLB4+FeTcr7WaDslBl5QIyrM6ljknzd+r3U5ndtBiTBnFutD4+YFOcGPXm1qE7R/1Olmt+ZwnB8O7CtOGldTv/Imoa+en8YFT0TH9gPstso6ERJIP4UbIxxxJF+soqNVkK5fY0qRSksosJJJTKdD8BNl9skcPo8S9J7TRtcBsbPytU/1DhnL19D+bp0o5NRLAWse2sTOv3dSZiBPIAeL5oSaSBkJ9GbZcVc95d7ga3cNgbZuvcNPLov+F1WsEYYZcM/zjhvevAAAAAQAFWC41MDkAAAOBMIIDfTCCAmWgAwIBAgIEHPuEUDANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTXlTdGF0ZTEPMA0GA1UEBxMGTXlDaXR5MRcwFQYDVQQKEw5NeU9yZ2FuaXphdGlvbjESMBAGA1UECxMJTXlPcmdVbml0MRAwDgYDVQQDEwdFeGFtcGxlMB4XDTE2MDYwMzEwMDE0NVoXDTI2MDYwMTEwMDE0NVowbzELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB015U3RhdGUxDzANBgNVBAcTBk15Q2l0eTEXMBUGA1UEChMOTXlPcmdhbml6YXRpb24xEjAQBgNVBAsTCU15T3JnVW5pdDEQMA4GA1UEAxMHRXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL12YRIsnxFfnXSOLn8GtCWf0pJr/NzSFDV7M1I0nLlytu7dD/XAwvRTV6CFEvZJ8a4Q5NmKDkB1XofN7uebEhIANcizwtu61JXyic26kQB3IhK4nb5BChIgJbvfXg4IiazbWIHR6cAyRWT/M6rXVVUNDIPRZ84O7rng2vKvZezGHS9BbsoewyhF71fWTmvu2s7Dcm1sI6bRxJnF4BCQdMEc8dfPqjWCQUqkvkPN4wyHUzVlQE0/pbOW4YN668dBSmTGHTWaUvEXgX333gAlG07YcbJtjqJznurkCKLrGssX2ozGQg84GKg9+Sq+nwN5a09Rfhn4UBRGrJ4MpZDpKAkCAwEAAaMhMB8wHQYDVR0OBBYEFJMKA17Zl2R5M8pqpmdUWFEERulHMA0GCSqGSIb3DQEBCwUAA4IBAQCFJQeVl+7XD9Is6lGHPgOr8Ep8pSHwCBY+95C4I7KPYapXB+U9gi9bKvVElfDD+IMPfqg2hRuFCnW3MQId/6QU+/c7+fwOnqE0oi6xo8nl7qx48Y/Ih3jXo3q7JON6CfrJHMSw47+gYi8c66S6EOePi2aGySQNBwqop85kEUhDEl6eGAAEo66+BrCUjwPNK3R5mGtx38FM54OibLkmDMS8pFfBN7qQ1C35JUdFDDJcNEBZ1WGIbkLxyIFsogJa1x6j235Fst9MASxeu5+xO3/WVHcLHQAZqJ/xZadEJAg2+YkPEhsrIEoFhRr3Hg13ECqD1W6aSW5kE5wPoWjru1gNUXYHaE8+iikx9yyc8V8V4CG63qk=", - "jgroups.jceks": "zs7OzgAAAAIAAAABAAAAAwAKc2VjcmV0LWtleQAAAVDQhuHmrO0ABXNyADNjb20uc3VuLmNyeXB0by5wcm92aWRlci5TZWFsZWRPYmplY3RGb3JLZXlQcm90ZWN0b3LNV8pZ5zC7UwIAAHhyABlqYXZheC5jcnlwdG8uU2VhbGVkT2JqZWN0PjY9psO3VHACAARbAA1lbmNvZGVkUGFyYW1zdAACW0JbABBlbmNyeXB0ZWRDb250ZW50cQB+AAJMAAlwYXJhbXNBbGd0ABJMamF2YS9sYW5nL1N0cmluZztMAAdzZWFsQWxncQB+AAN4cHVyAAJbQqzzF/gGCFTgAgAAeHAAAAAPMA0ECHcwLGK6EDyLAgEUdXEAfgAFAAAAmCu9wRKf1aYYUOEWe406ncPtIdm3147G7MJyWUu2kJVY15a2QxeZi9w5J3AF6T64CvylUuQjpcC4DWXwVn9BefntkBR8CzTiH7VxEqVOQ/OkFS29Inoq8t7/NBaTgTdmMkb4ETV1gIsy/+W6kk7QTqxItCkdKKGFE90Be/7yL3tG16TCy/ABKl7CO6PHa44CqK2PUE1oaJ+WdAAWUEJFV2l0aE1ENUFuZFRyaXBsZURFU3QAFlBCRVdpdGhNRDVBbmRUcmlwbGVERVMN658veJP01V2j9y8bQCYIzViutw==" - } - } - ] -} diff --git a/tests/arq/src/test/resources/openjdk18-mysql-persistent-s2i.json b/tests/arq/src/test/resources/openjdk18-mysql-persistent-s2i.json deleted file mode 100644 index b803b944..00000000 --- a/tests/arq/src/test/resources/openjdk18-mysql-persistent-s2i.json +++ /dev/null @@ -1,639 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "annotations": { - "iconClass": "icon-jboss", - "description": "Application template for Java MySql applications with persistent storage built using S2I.", - "tags": "java,mysql,xpaas", - "version": "1.0.0" - }, - "name": "openjdk18-mysql-persistent-s2i" - }, - "labels": { - "template": "openjdk18-mysql-persistent-s2i", - "xpaas": "1.0.0" - }, - "message": "A new java application has been created in your project.", - "parameters": [ - { - "description": "The name for the application.", - "displayName": "Application Name", - "name": "APPLICATION_NAME", - "value": "openjdk-app", - "required": true - }, - { - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "displayName": "Custom http Route Hostname", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, - { - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "openjdk-app-secret", - "required": true - }, - { - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, - { - "description": "Git source URI for application", - "displayName": "Git Repository URL", - "name": "SOURCE_REPOSITORY_URL", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "description": "Git branch/tag reference", - "displayName": "Git Reference", - "name": "SOURCE_REPOSITORY_REF", - "value": "master", - "required": false - }, - { - "description": "Path within Git project to build; empty for root project directory.", - "displayName": "Context Directory", - "name": "CONTEXT_DIR", - "value": "undertow-jdbc", - "required": false - }, - { - "description": "Database name", - "name": "DB_DATABASE", - "value": "root", - "required": true - }, - { - "description": "Size of persistent storage for database volume.", - "name": "VOLUME_CAPACITY", - "value": "512Mi", - "required": true - }, - { - "description": "Sets how the table names are stored and compared.", - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "required": false - }, - { - "description": "The maximum permitted number of simultaneous client connections.", - "name": "MYSQL_MAX_CONNECTIONS", - "required": false - }, - { - "description": "The minimum length of the word to be included in a FULLTEXT index.", - "name": "MYSQL_FT_MIN_WORD_LEN", - "required": false - }, - { - "description": "The maximum length of the word to be included in a FULLTEXT index.", - "name": "MYSQL_FT_MAX_WORD_LEN", - "required": false - }, - { - "description": "Controls the innodb_use_native_aio setting value if the native AIO is broken.", - "name": "MYSQL_AIO", - "required": false - }, - { - "description": "Database user name", - "name": "DB_USERNAME", - "from": "user[a-zA-Z0-9]{3}", - "generate": "expression", - "required": true - }, - { - "description": "Database user password", - "name": "DB_PASSWORD", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "GitHub trigger secret", - "displayName": "Github Webhook Secret", - "name": "GITHUB_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Generic build trigger secret", - "displayName": "Generic Webhook Secret", - "name": "GENERIC_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "displayName": "ImageStream Namespace", - "name": "IMAGE_STREAM_NAMESPACE", - "value": "openshift", - "required": true - }, - { - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds", - "name": "MAVEN_MIRROR_URL", - "value": "", - "required": false - } - ], - "objects": [ - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's http port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's https port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 3306, - "targetPort": 3306 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}-mysql", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The database server's port." - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's http service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" - }, - "tls": { - "termination": "passthrough" - } - } - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "${SOURCE_REPOSITORY_URL}", - "ref": "${SOURCE_REPOSITORY_REF}" - }, - "contextDir": "${CONTEXT_DIR}" - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "java:8" - }, - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - } - ] - } - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "triggers": [ - { - "type": "GitHub", - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - } - }, - { - "type": "Generic", - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - } - }, - { - "type": "ImageChange", - "imageChange": {} - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 75, - "containers": [ - { - "name": "${APPLICATION_NAME}", - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "volumeMounts": [ - { - "name": "openjdk-keystore-volume", - "mountPath": "/etc/openjdk-secret-volume", - "readOnly": true - } - ], - "readinessProbe": { - "tcpSocket": { - "port": 8080 - }, - "initialDelaySeconds": 5 - }, - "env": [ - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/openjdk-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, - { - "name": "DB_DRIVER", - "value": "mysql" - }, - { - "name": "DB_HOST", - "value": "${APPLICATION_NAME}-mysql" - }, - { - "name": "DB_PORT", - "value": "3306" - }, - { - "name": "DB_USERNAME", - "value": "${DB_USERNAME}" - }, - { - "name": "DB_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "DB_DATABASE", - "value": "${DB_DATABASE}" - } - ], - "ports": [ - { - "name": "jolokia", - "containerPort": 8778, - "protocol": "TCP" - }, - { - "name": "http", - "containerPort": 8080, - "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - } - ] - } - ], - "volumes": [ - { - "name": "openjdk-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - } - ] - } - } - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}-mysql", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-mysql" - ], - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "mysql:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}-mysql", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 60, - "containers": [ - { - "name": "${APPLICATION_NAME}-mysql", - "image": "mysql", - "imagePullPolicy": "Always", - "ports": [ - { - "containerPort": 3306, - "protocol": "TCP" - } - ], - "readinessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 5, - "exec": { - "command": [ "/bin/sh", "-i", "-c", - "MYSQL_PWD=\"$MYSQL_PASSWORD\" mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE -e 'SELECT 1'"] - } - }, - "livenessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 240, - "tcpSocket": { - "port": 3306 - } - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/mysql/data", - "name": "${APPLICATION_NAME}-mysql-pvol" - } - ], - "env": [ - { - "name": "MYSQL_USER", - "value": "${DB_USERNAME}" - }, - { - "name": "MYSQL_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "MYSQL_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "value": "${MYSQL_LOWER_CASE_TABLE_NAMES}" - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "value": "${MYSQL_MAX_CONNECTIONS}" - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "value": "${MYSQL_FT_MIN_WORD_LEN}" - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "value": "${MYSQL_FT_MAX_WORD_LEN}" - }, - { - "name": "MYSQL_AIO", - "value": "${MYSQL_AIO}" - } - ] - } - ], - "volumes": [ - { - "name": "${APPLICATION_NAME}-mysql-pvol", - "persistentVolumeClaim": { - "claimName": "${APPLICATION_NAME}-mysql-claim" - } - } - ] - } - } - } - }, - { - "apiVersion": "v1", - "kind": "PersistentVolumeClaim", - "metadata": { - "name": "${APPLICATION_NAME}-mysql-claim", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "${VOLUME_CAPACITY}" - } - } - } - } - ] -} diff --git a/tests/arq/src/test/resources/openjdk18-mysql-s2i.json b/tests/arq/src/test/resources/openjdk18-mysql-s2i.json deleted file mode 100644 index 9847c7f6..00000000 --- a/tests/arq/src/test/resources/openjdk18-mysql-s2i.json +++ /dev/null @@ -1,599 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "annotations": { - "iconClass": "icon-jboss", - "description": "Application template for Java applications built using S2I.", - "tags": "java,mysql,xpaas", - "version": "1.0.0" - }, - "name": "openjdk18-mysql-s2i" - }, - "labels": { - "template": "openjdk18-mysql-s2i", - "xpaas": "1.0.0" - }, - "message": "A new java application has been created in your project.", - "parameters": [ - { - "description": "The name for the application.", - "displayName": "Application Name", - "name": "APPLICATION_NAME", - "value": "openjdk-app", - "required": true - }, - { - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "displayName": "Custom http Route Hostname", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, - { - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "openjdk-app-secret", - "required": true - }, - { - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, - { - "description": "Git source URI for application", - "displayName": "Git Repository URL", - "name": "SOURCE_REPOSITORY_URL", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "description": "Git branch/tag reference", - "displayName": "Git Reference", - "name": "SOURCE_REPOSITORY_REF", - "value": "master", - "required": false - }, - { - "description": "Path within Git project to build; empty for root project directory.", - "displayName": "Context Directory", - "name": "CONTEXT_DIR", - "value": "undertow-jdbc", - "required": false - }, - { - "description": "Database name", - "name": "DB_DATABASE", - "value": "root", - "required": true - }, - { - "description": "Sets how the table names are stored and compared.", - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "required": false - }, - { - "description": "The maximum permitted number of simultaneous client connections.", - "name": "MYSQL_MAX_CONNECTIONS", - "required": false - }, - { - "description": "The minimum length of the word to be included in a FULLTEXT index.", - "name": "MYSQL_FT_MIN_WORD_LEN", - "required": false - }, - { - "description": "The maximum length of the word to be included in a FULLTEXT index.", - "name": "MYSQL_FT_MAX_WORD_LEN", - "required": false - }, - { - "description": "Controls the innodb_use_native_aio setting value if the native AIO is broken.", - "name": "MYSQL_AIO", - "required": false - }, - { - "description": "Database user name", - "name": "DB_USERNAME", - "from": "user[a-zA-Z0-9]{3}", - "generate": "expression", - "required": true - }, - { - "description": "Database user password", - "name": "DB_PASSWORD", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "GitHub trigger secret", - "displayName": "Github Webhook Secret", - "name": "GITHUB_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Generic build trigger secret", - "displayName": "Generic Webhook Secret", - "name": "GENERIC_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "displayName": "ImageStream Namespace", - "name": "IMAGE_STREAM_NAMESPACE", - "value": "openshift", - "required": true - }, - { - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds", - "name": "MAVEN_MIRROR_URL", - "value": "", - "required": false - } - ], - "objects": [ - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's http port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's https port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 3306, - "targetPort": 3306 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}-mysql", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The database server's port." - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's http service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" - }, - "tls": { - "termination": "passthrough" - } - } - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "${SOURCE_REPOSITORY_URL}", - "ref": "${SOURCE_REPOSITORY_REF}" - }, - "contextDir": "${CONTEXT_DIR}" - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "java:8" - }, - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - } - ] - } - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "triggers": [ - { - "type": "GitHub", - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - } - }, - { - "type": "Generic", - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - } - }, - { - "type": "ImageChange", - "imageChange": {} - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 75, - "containers": [ - { - "name": "${APPLICATION_NAME}", - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "volumeMounts": [ - { - "name": "openjdk-keystore-volume", - "mountPath": "/etc/openjdk-secret-volume", - "readOnly": true - } - ], - "readinessProbe": { - "tcpSocket": { - "port": 8080 - }, - "initialDelaySeconds": 5 - }, - "env": [ - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/openjdk-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, - { - "name": "DB_DRIVER", - "value": "mysql" - }, - { - "name": "DB_HOST", - "value": "${APPLICATION_NAME}-mysql" - }, - { - "name": "DB_PORT", - "value": "3306" - }, - { - "name": "DB_USERNAME", - "value": "${DB_USERNAME}" - }, - { - "name": "DB_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "DB_DATABASE", - "value": "${DB_DATABASE}" - } - ], - "ports": [ - { - "name": "jolokia", - "containerPort": 8778, - "protocol": "TCP" - }, - { - "name": "http", - "containerPort": 8080, - "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - } - ] - } - ], - "volumes": [ - { - "name": "openjdk-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - } - ] - } - } - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}-mysql", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-mysql" - ], - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "mysql:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}-mysql", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 60, - "containers": [ - { - "name": "${APPLICATION_NAME}-mysql", - "image": "mysql", - "imagePullPolicy": "Always", - "ports": [ - { - "containerPort": 3306, - "protocol": "TCP" - } - ], - "readinessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 5, - "exec": { - "command": [ "/bin/sh", "-i", "-c", - "MYSQL_PWD=\"$MYSQL_PASSWORD\" mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE -e 'SELECT 1'"] - } - }, - "livenessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 240, - "tcpSocket": { - "port": 3306 - } - }, - "env": [ - { - "name": "MYSQL_USER", - "value": "${DB_USERNAME}" - }, - { - "name": "MYSQL_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "MYSQL_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "value": "${MYSQL_LOWER_CASE_TABLE_NAMES}" - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "value": "${MYSQL_MAX_CONNECTIONS}" - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "value": "${MYSQL_FT_MIN_WORD_LEN}" - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "value": "${MYSQL_FT_MAX_WORD_LEN}" - }, - { - "name": "MYSQL_AIO", - "value": "${MYSQL_AIO}" - } - ] - } - ] - } - } - } - } - ] -} diff --git a/tests/arq/src/test/resources/openjdk18-postgresql-persistent-s2i.json b/tests/arq/src/test/resources/openjdk18-postgresql-persistent-s2i.json deleted file mode 100644 index eeed05a5..00000000 --- a/tests/arq/src/test/resources/openjdk18-postgresql-persistent-s2i.json +++ /dev/null @@ -1,619 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "annotations": { - "iconClass": "icon-jboss", - "description": "Application template for Java PostgreSQL applications with persistent storage built using S2I.", - "tags": "java,postgresql,xpaas", - "version": "1.0.0" - }, - "name": "openjdk18-postgresql-persistent-s2i" - }, - "labels": { - "template": "openjdk18-postgresql-persistent-s2i", - "xpaas": "1.0.0" - }, - "message": "A new java application has been created in your project.", - "parameters": [ - { - "description": "The name for the application.", - "displayName": "Application Name", - "name": "APPLICATION_NAME", - "value": "openjdk-app", - "required": true - }, - { - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "displayName": "Custom http Route Hostname", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, - { - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "openjdk-app-secret", - "required": true - }, - { - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, - { - "description": "Git source URI for application", - "displayName": "Git Repository URL", - "name": "SOURCE_REPOSITORY_URL", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "description": "Git branch/tag reference", - "displayName": "Git Reference", - "name": "SOURCE_REPOSITORY_REF", - "value": "master", - "required": false - }, - { - "description": "Path within Git project to build; empty for root project directory.", - "displayName": "Context Directory", - "name": "CONTEXT_DIR", - "value": "undertow-jdbc", - "required": false - }, - { - "description": "Database name", - "name": "DB_DATABASE", - "value": "root", - "required": true - }, - { - "description": "Size of persistent storage for database volume.", - "name": "VOLUME_CAPACITY", - "value": "512Mi", - "required": true - }, - { - "description": "The maximum permitted number of simultaneous client connections.", - "name": "POSTGRESQL_MAX_CONNECTIONS", - "required": false - }, - { - "description": "Configures how much memory is dedicated to PostgreSQL for caching data.", - "name": "POSTGRESQL_SHARED_BUFFERS", - "required": false - }, - { - "description": "Database user name", - "name": "DB_USERNAME", - "from": "user[a-zA-Z0-9]{3}", - "generate": "expression", - "required": true - }, - { - "description": "Database user password", - "name": "DB_PASSWORD", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "GitHub trigger secret", - "displayName": "Github Webhook Secret", - "name": "GITHUB_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Generic build trigger secret", - "displayName": "Generic Webhook Secret", - "name": "GENERIC_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "displayName": "ImageStream Namespace", - "name": "IMAGE_STREAM_NAMESPACE", - "value": "openshift", - "required": true - }, - { - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds", - "name": "MAVEN_MIRROR_URL", - "value": "", - "required": false - } - ], - "objects": [ - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's http port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's https port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 5432, - "targetPort": 5432 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}-postgresql", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The database server's port." - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's http service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" - }, - "tls": { - "termination": "passthrough" - } - } - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "${SOURCE_REPOSITORY_URL}", - "ref": "${SOURCE_REPOSITORY_REF}" - }, - "contextDir": "${CONTEXT_DIR}" - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "java:8" - }, - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - } - ] - } - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "triggers": [ - { - "type": "GitHub", - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - } - }, - { - "type": "Generic", - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - } - }, - { - "type": "ImageChange", - "imageChange": {} - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 75, - "containers": [ - { - "name": "${APPLICATION_NAME}", - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "volumeMounts": [ - { - "name": "openjdk-keystore-volume", - "mountPath": "/etc/openjdk-secret-volume", - "readOnly": true - } - ], - "readinessProbe": { - "tcpSocket": { - "port": 8080 - }, - "initialDelaySeconds": 5 - }, - "env": [ - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/openjdk-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, - { - "name": "DB_DRIVER", - "value": "postgresql" - }, - { - "name": "DB_HOST", - "value": "${APPLICATION_NAME}-postgresql" - }, - { - "name": "DB_PORT", - "value": "5432" - }, - { - "name": "DB_USERNAME", - "value": "${DB_USERNAME}" - }, - { - "name": "DB_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "DB_DATABASE", - "value": "${DB_DATABASE}" - } - ], - "ports": [ - { - "name": "jolokia", - "containerPort": 8778, - "protocol": "TCP" - }, - { - "name": "http", - "containerPort": 8080, - "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - } - ] - } - ], - "volumes": [ - { - "name": "openjdk-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - } - ] - } - } - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}-postgresql", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "postgresql:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}-postgresql", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 60, - "containers": [ - { - "name": "${APPLICATION_NAME}-postgresql", - "image": "postgresql", - "imagePullPolicy": "Always", - "ports": [ - { - "containerPort": 5432, - "protocol": "TCP" - } - ], - "readinessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 5, - "exec": { - "command": [ "/bin/sh", "-i", "-c", "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'"] - } - }, - "livenessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 5432 - } - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/pgsql/data", - "name": "${APPLICATION_NAME}-postgresql-pvol" - } - ], - "env": [ - { - "name": "POSTGRESQL_USER", - "value": "${DB_USERNAME}" - }, - { - "name": "POSTGRESQL_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "POSTGRESQL_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "POSTGRESQL_MAX_CONNECTIONS", - "value": "${POSTGRESQL_MAX_CONNECTIONS}" - }, - { - "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", - "value": "${POSTGRESQL_MAX_CONNECTIONS}" - }, - { - "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", - "value": "${POSTGRESQL_MAX_CONNECTIONS}" - }, - { - "name": "POSTGRESQL_SHARED_BUFFERS", - "value": "${POSTGRESQL_SHARED_BUFFERS}" - } - ] - } - ], - "volumes": [ - { - "name": "${APPLICATION_NAME}-postgresql-pvol", - "persistentVolumeClaim": { - "claimName": "${APPLICATION_NAME}-postgresql-claim" - } - } - ] - } - } - } - }, - { - "apiVersion": "v1", - "kind": "PersistentVolumeClaim", - "metadata": { - "name": "${APPLICATION_NAME}-postgresql-claim", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "${VOLUME_CAPACITY}" - } - } - } - } - ] -} diff --git a/tests/arq/src/test/resources/openjdk18-postgresql-s2i.json b/tests/arq/src/test/resources/openjdk18-postgresql-s2i.json deleted file mode 100644 index d6ad9099..00000000 --- a/tests/arq/src/test/resources/openjdk18-postgresql-s2i.json +++ /dev/null @@ -1,579 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "annotations": { - "iconClass": "icon-jboss", - "description": "Application template for Java applications built using S2I.", - "tags": "java,postgresql,xpaas", - "version": "1.0.0" - }, - "name": "openjdk18-postgresql-s2i" - }, - "labels": { - "template": "openjdk18-postgresql-s2i", - "xpaas": "1.0.0" - }, - "message": "A new java application has been created in your project.", - "parameters": [ - { - "description": "The name for the application.", - "displayName": "Application Name", - "name": "APPLICATION_NAME", - "value": "openjdk-app", - "required": true - }, - { - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "displayName": "Custom http Route Hostname", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, - { - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "openjdk-app-secret", - "required": true - }, - { - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, - { - "description": "Git source URI for application", - "displayName": "Git Repository URL", - "name": "SOURCE_REPOSITORY_URL", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "description": "Git branch/tag reference", - "displayName": "Git Reference", - "name": "SOURCE_REPOSITORY_REF", - "value": "master", - "required": false - }, - { - "description": "Path within Git project to build; empty for root project directory.", - "displayName": "Context Directory", - "name": "CONTEXT_DIR", - "value": "undertow-jdbc", - "required": false - }, - { - "description": "Database name", - "name": "DB_DATABASE", - "value": "root", - "required": true - }, - { - "description": "The maximum permitted number of simultaneous client connections.", - "name": "POSTGRESQL_MAX_CONNECTIONS", - "required": false - }, - { - "description": "Configures how much memory is dedicated to PostgreSQL for caching data.", - "name": "POSTGRESQL_SHARED_BUFFERS", - "required": false - }, - { - "description": "Database user name", - "name": "DB_USERNAME", - "from": "user[a-zA-Z0-9]{3}", - "generate": "expression", - "required": true - }, - { - "description": "Database user password", - "name": "DB_PASSWORD", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "GitHub trigger secret", - "displayName": "Github Webhook Secret", - "name": "GITHUB_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Generic build trigger secret", - "displayName": "Generic Webhook Secret", - "name": "GENERIC_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "displayName": "ImageStream Namespace", - "name": "IMAGE_STREAM_NAMESPACE", - "value": "openshift", - "required": true - }, - { - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds", - "name": "MAVEN_MIRROR_URL", - "value": "", - "required": false - } - ], - "objects": [ - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's http port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's https port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 5432, - "targetPort": 5432 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}-postgresql", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The database server's port." - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's http service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" - }, - "tls": { - "termination": "passthrough" - } - } - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "${SOURCE_REPOSITORY_URL}", - "ref": "${SOURCE_REPOSITORY_REF}" - }, - "contextDir": "${CONTEXT_DIR}" - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "java:8" - }, - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - } - ] - } - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "triggers": [ - { - "type": "GitHub", - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - } - }, - { - "type": "Generic", - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - } - }, - { - "type": "ImageChange", - "imageChange": {} - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 75, - "containers": [ - { - "name": "${APPLICATION_NAME}", - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "volumeMounts": [ - { - "name": "openjdk-keystore-volume", - "mountPath": "/etc/openjdk-secret-volume", - "readOnly": true - } - ], - "readinessProbe": { - "tcpSocket": { - "port": 8080 - }, - "initialDelaySeconds": 5 - }, - "env": [ - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/openjdk-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, - { - "name": "DB_DRIVER", - "value": "postgresql" - }, - { - "name": "DB_HOST", - "value": "${APPLICATION_NAME}-postgresql" - }, - { - "name": "DB_PORT", - "value": "5432" - }, - { - "name": "DB_USERNAME", - "value": "${DB_USERNAME}" - }, - { - "name": "DB_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "DB_DATABASE", - "value": "${DB_DATABASE}" - } - ], - "ports": [ - { - "name": "jolokia", - "containerPort": 8778, - "protocol": "TCP" - }, - { - "name": "http", - "containerPort": 8080, - "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - } - ] - } - ], - "volumes": [ - { - "name": "openjdk-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - } - ] - } - } - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}-postgresql", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "postgresql:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}-postgresql", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 60, - "containers": [ - { - "name": "${APPLICATION_NAME}-postgresql", - "image": "postgresql", - "imagePullPolicy": "Always", - "ports": [ - { - "containerPort": 5432, - "protocol": "TCP" - } - ], - "readinessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 5, - "exec": { - "command": [ "/bin/sh", "-i", "-c", "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'"] - } - }, - "livenessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 5432 - } - }, - "env": [ - { - "name": "POSTGRESQL_USER", - "value": "${DB_USERNAME}" - }, - { - "name": "POSTGRESQL_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "POSTGRESQL_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "POSTGRESQL_MAX_CONNECTIONS", - "value": "${POSTGRESQL_MAX_CONNECTIONS}" - }, - { - "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", - "value": "${POSTGRESQL_MAX_CONNECTIONS}" - }, - { - "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", - "value": "${POSTGRESQL_MAX_CONNECTIONS}" - }, - { - "name": "POSTGRESQL_SHARED_BUFFERS", - "value": "${POSTGRESQL_SHARED_BUFFERS}" - } - ] - } - ] - } - } - } - } - ] -} diff --git a/tests/arq/src/test/resources/openjdk18-web-https-s2i.json b/tests/arq/src/test/resources/openjdk18-web-https-s2i.json deleted file mode 100644 index d1fb199b..00000000 --- a/tests/arq/src/test/resources/openjdk18-web-https-s2i.json +++ /dev/null @@ -1,400 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "annotations": { - "iconClass": "icon-jboss", - "description": "Application template for Java applications built using S2I.", - "tags": "java,xpaas", - "version": "1.0.0", - "openshift.io/display-name": "Red Hat OpenJDK 8" - }, - "name": "openjdk18-web-basic-s2i" - }, - "labels": { - "template": "openjdk18-web-basic-s2i", - "xpaas": "1.0.0" - }, - "message": "A new java application has been created in your project.", - "parameters": [ - { - "description": "The name for the application.", - "displayName": "Application Name", - "name": "APPLICATION_NAME", - "value": "openjdk-app", - "required": true - }, - { - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "displayName": "Custom http Route Hostname", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "displayName": "Custom https Route Hostname", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, - { - "description": "The name of the secret containing the keystore file", - "displayName": "Server Keystore Secret Name", - "name": "HTTPS_SECRET", - "value": "openjdk-app-secret", - "required": true - }, - { - "description": "The name of the keystore file within the secret", - "displayName": "Server Keystore Filename", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "description": "The name associated with the server certificate", - "displayName": "Server Certificate Name", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "description": "The password for the keystore and certificate", - "displayName": "Server Keystore Password", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, - { - "description": "Git source URI for application", - "displayName": "Git Repository URL", - "name": "SOURCE_REPOSITORY_URL", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "description": "Git branch/tag reference", - "displayName": "Git Reference", - "name": "SOURCE_REPOSITORY_REF", - "value": "master", - "required": false - }, - { - "description": "Path within Git project to build; empty for root project directory.", - "displayName": "Context Directory", - "name": "CONTEXT_DIR", - "value": "undertow-servlet", - "required": false - }, - { - "description": "GitHub trigger secret", - "displayName": "Github Webhook Secret", - "name": "GITHUB_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Generic build trigger secret", - "displayName": "Generic Webhook Secret", - "name": "GENERIC_WEBHOOK_SECRET", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "required": true - }, - { - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "displayName": "ImageStream Namespace", - "name": "IMAGE_STREAM_NAMESPACE", - "value": "openshift", - "required": true - }, - { - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds", - "name": "MAVEN_MIRROR_URL", - "value": "", - "required": false - } - ], - "objects": [ - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's http port." - } - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The application's https port." - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's http service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" - }, - "tls": { - "termination": "passthrough" - } - } - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "${SOURCE_REPOSITORY_URL}", - "ref": "${SOURCE_REPOSITORY_REF}" - }, - "contextDir": "${CONTEXT_DIR}" - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "java:8" - }, - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - } - ] - } - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "triggers": [ - { - "type": "GitHub", - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - } - }, - { - "type": "Generic", - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - } - }, - { - "type": "ImageChange", - "imageChange": {} - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "template": { - "metadata": { - "name": "${APPLICATION_NAME}", - "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" - } - }, - "spec": { - "terminationGracePeriodSeconds": 75, - "containers": [ - { - "name": "${APPLICATION_NAME}", - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "volumeMounts": [ - { - "name": "openjdk-keystore-volume", - "mountPath": "/etc/openjdk-secret-volume", - "readOnly": true - } - ], - "readinessProbe": { - "tcpSocket": { - "port": 8080 - }, - "initialDelaySeconds": 5 - }, - "env": [ - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/openjdk-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - } - ], - "ports": [ - { - "name": "jolokia", - "containerPort": 8778, - "protocol": "TCP" - }, - { - "name": "http", - "containerPort": 8080, - "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - } - ] - } - ], - "volumes": [ - { - "name": "openjdk-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - } - ] - } - } - } - } - ] -} diff --git a/tests/arq/src/test/resources/testrunner-pod-ppc64le.json b/tests/arq/src/test/resources/testrunner-pod-ppc64le.json deleted file mode 100644 index 645388e2..00000000 --- a/tests/arq/src/test/resources/testrunner-pod-ppc64le.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Pod", - "metadata": { - "name": "testrunner", - "labels": { - "name": "testrunner" - } - }, - "spec": { - "terminationGracePeriodSeconds": 0, - "containers": [ - { - "name": "testrunner", - "readinessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 5, - "tcpSocket": { - "port": 9990 - } - }, - "image": "docker.io/goldmann/wildfly-testrunner:ppc64le", - "ports": [ - { - "containerPort": 8080, - "protocol": "TCP" - }, - { - "containerPort": 9990, - "protocol": "TCP" - }, - { - "containerPort": 9999, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "ADMIN_USERNAME", - "value": "admin" - }, - { - "name": "ADMIN_PASSWORD", - "value": "Admin#70365" - } - ] - } - ] - } -} diff --git a/tests/arq/src/test/resources/testrunner-pod.json b/tests/arq/src/test/resources/testrunner-pod.json deleted file mode 100644 index d693c15d..00000000 --- a/tests/arq/src/test/resources/testrunner-pod.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Pod", - "metadata": { - "name": "testrunner", - "labels": { - "name": "testrunner" - } - }, - "spec": { - "terminationGracePeriodSeconds": 0, - "containers": [ - { - "name": "testrunner", - "readinessProbe": { - "timeoutSeconds": 1, - "initialDelaySeconds": 5, - "tcpSocket": { - "port": 9990 - } - }, - "image": "docker.io/goldmann/wildfly-testrunner:x86_64", - "ports": [ - { - "containerPort": 8080, - "protocol": "TCP" - }, - { - "containerPort": 9990, - "protocol": "TCP" - }, - { - "containerPort": 9999, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "ADMIN_USERNAME", - "value": "admin" - }, - { - "name": "ADMIN_PASSWORD", - "value": "Admin#70365" - } - ] - } - ] - } -}