TEMPtest2

arquillian · Dec 22, 2024 · 616d22c · 616d22c
1 parent 7dae82b
commit 616d22c
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 2 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -49,6 +49,11 @@ jobs:
         with:
           oc version: 'v3.10.0'
           github token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup OLM on OpenShift v3.z
+        if: ${{ matrix.target  == 'openshift' }}
+        run: |
+          set -x
+          oc get routes -A
 #      - name: Setup OLM on OpenShift v3.z
 #        if: ${{ matrix.target  == 'openshift' }}
 #        run: |

diff --git a/...outeurl/src/test/java/org/arquillian/cube/openshift/routeurl/RouteInOtherNamespaceIT.java b/...outeurl/src/test/java/org/arquillian/cube/openshift/routeurl/RouteInOtherNamespaceIT.java
@@ -8,6 +8,8 @@
 
 import io.fabric8.openshift.api.model.Route;
 import io.fabric8.openshift.client.OpenShiftClient;
+import org.arquillian.cube.openshift.api.OpenShiftResource;
+import org.arquillian.cube.openshift.impl.enricher.AwaitRoute;
 import org.arquillian.cube.openshift.impl.enricher.RouteURL;
 import org.arquillian.cube.openshift.impl.requirement.RequiresOpenshift;
 import org.arquillian.cube.requirement.ArquillianConditionalRunner;
@@ -22,16 +24,19 @@
 @Category(RequiresOpenshift.class)
 @RequiresOpenshift
 @RunWith(ArquillianConditionalRunner.class)
+@OpenShiftResource("classpath:hello-world-route.yaml")
 public class RouteInOtherNamespaceIT {
 
-    @RouteURL(value = "prometheus-k8s", namespace = "openshift-monitoring")
+    @RouteURL(value = "hello-world", namespace = "default")
+    @AwaitRoute
     private URL routeURL;
 
     @ArquillianResource
     OpenShiftClient client;
 
     @Before
     public void enumerateRoutes() {
+        System.out.println("---> DEBUG: Enumerating routes in all namespaces");
         client.namespaces().list().getItems().stream().forEach(n ->
             {
                 final String namespace = n.getMetadata().getName();
@@ -53,7 +58,8 @@ public void injectedIntoClassShouldNotBeNull() {
 
     @Test
     public void injectedIntoMethodShouldNotBeNull(
-        @RouteURL(value = "prometheus-k8s", namespace = "openshift-monitoring") URL routeURL) {
+        @RouteURL(value = "hello-world", namespace = "default")
+        @AwaitRoute URL routeURL) {
         assertThat(routeURL).isNotNull();
     }
 

diff --git a/openshift/ftest-openshift-routeurl/src/test/resources/arquillian.xml b/openshift/ftest-openshift-routeurl/src/test/resources/arquillian.xml
@@ -4,6 +4,7 @@
   xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
   <extension qualifier="openshift">
+    <property name="env.config.resource.name">hello-openshift.json</property>
   </extension>
 
 </arquillian>
diff --git a/openshift/ftest-openshift-routeurl/src/test/resources/hello-openshift.json b/openshift/ftest-openshift-routeurl/src/test/resources/hello-openshift.json
@@ -0,0 +1,63 @@
+{
+  "apiVersion" : "v1",
+  "kind" : "List",
+  "items" : [ {
+    "apiVersion" : "v1",
+    "kind" : "Service",
+    "metadata" : {
+      "name" : "hello-world",
+      "namespace" : "default"
+    },
+    "spec" : {
+      "ports" : [ {
+        "port" : 8080,
+        "protocol" : "TCP",
+        "targetPort" : 8080
+      } ],
+      "selector" : {
+        "app" : "hello-world"
+      }
+    }
+  }, {
+    "apiVersion" : "apps/v1",
+    "kind" : "Deployment",
+    "metadata" : {
+      "name" : "hello-world",
+      "namespace" : "default"
+    },
+    "spec" : {
+      "replicas" : 1,
+      "selector" : {
+        "matchLabels": {
+          "app": "hello-world"
+        }
+      },
+      "template" : {
+        "metadata" : {
+          "labels" : {
+            "app" : "hello-world"
+          }
+        },
+        "spec" : {
+          "containers" : [ {
+            "image" : "quay.io/openshift/origin-hello-openshift:latest",
+            "imagePullPolicy": "IfNotPresent",
+            "name" : "hello-world-container",
+            "ports" : [ {
+              "name" : "http",
+              "protocol" : "TCP",
+              "containerPort" : 8080
+            } ],
+            "readinessProbe": {
+              "httpGet": {
+                "path": "/",
+                "port": 8080
+              },
+              "initialDelaySeconds": 1
+            }
+          } ]
+        }
+      }
+    }
+  }]
+}
diff --git a/openshift/ftest-openshift-routeurl/src/test/resources/hello-world-route.yaml b/openshift/ftest-openshift-routeurl/src/test/resources/hello-world-route.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Route
+metadata:
+  name: hello-world
+  namespace: default
+spec:
+  port:
+    targetPort: 8080
+  to:
+    kind: Service
+    name: hello-world