Skip to content

Commit db3d7c6

Browse files
manusamanusa
committed
ci: initial fixes to run OpenShift specific pipelines
1 parent fb0683e commit db3d7c6

21 files changed

+100
-53
lines changed

‎.github/workflows/e2e-httpclient-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
strategy:
6767
fail-fast: false
6868
matrix:
69-
openshift: [v3.11.0, v3.10.0]
69+
openshift: [v3.10.0]
7070
httpclient: [jdk,jetty,vertx]
7171
steps:
7272
- name: Checkout

‎.github/workflows/e2e-tests.yml

+1-21
Original file line numberDiff line numberDiff line change
@@ -132,28 +132,8 @@ jobs:
132132
strategy:
133133
fail-fast: false
134134
matrix:
135-
openshift: [v3.11.0, v3.10.0]
135+
openshift: [v3.10.0]
136136
steps:
137-
- name: Free up Space
138-
run: |
139-
sudo apt list --installed
140-
sudo apt-get purge -y \
141-
'aspnetcore.*' \
142-
'cabal-install.*' \
143-
'clang.*' \
144-
'dotnet.*' \
145-
'firefox.*' \
146-
'ghc.*' \
147-
'google-chrome.*' \
148-
'heroku.*' \
149-
'libmagic.*' \
150-
'libmono.*' \
151-
'mono-.*' \
152-
'mysql.*' \
153-
'php.*' \
154-
'ruby.*'
155-
sudo apt-get autoremove
156-
df -h
157137
- name: Checkout
158138
uses: actions/checkout@v4
159139
- name: Setup OpenShift

‎kubernetes-itests/src/test/java/io/fabric8/openshift/AdaptIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
1920
import io.fabric8.kubernetes.client.KubernetesClient;
2021
import io.fabric8.openshift.api.model.Project;
@@ -24,6 +25,7 @@
2425
import static org.junit.jupiter.api.Assertions.assertNotNull;
2526
import static org.junit.jupiter.api.Assertions.assertTrue;
2627

28+
@KubernetesTest(createEphemeralNamespace = false)
2729
@RequireK8sSupport(Project.class)
2830
class AdaptIT {
2931

‎kubernetes-itests/src/test/java/io/fabric8/openshift/BuildConfigIT.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.LoadKubernetesManifests;
1920
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
2021
import io.fabric8.openshift.api.model.BuildConfig;
2122
import io.fabric8.openshift.api.model.BuildConfigBuilder;
2223
import io.fabric8.openshift.api.model.BuildConfigList;
2324
import io.fabric8.openshift.api.model.BuildSourceBuilder;
2425
import io.fabric8.openshift.client.OpenShiftClient;
26+
import org.assertj.core.api.InstanceOfAssertFactories;
2527
import org.junit.jupiter.api.Test;
2628

2729
import java.util.Objects;
@@ -32,6 +34,7 @@
3234
import static org.junit.jupiter.api.Assertions.assertNotNull;
3335
import static org.junit.jupiter.api.Assertions.assertTrue;
3436

37+
@KubernetesTest(createEphemeralNamespace = false)
3538
@RequireK8sSupport(BuildConfig.class)
3639
@LoadKubernetesManifests("/buildconfig-it.yml")
3740
class BuildConfigIT {
@@ -54,8 +57,11 @@ void get() {
5457
@Test
5558
void list() {
5659
BuildConfigList bcList = client.buildConfigs().list();
57-
assertThat(bcList).isNotNull();
58-
assertTrue(bcList.getItems().size() >= 1);
60+
assertThat(bcList)
61+
.isNotNull()
62+
.extracting(BuildConfigList::getItems)
63+
.asInstanceOf(InstanceOfAssertFactories.list(BuildConfig.class))
64+
.hasSizeGreaterThanOrEqualTo(1);
5965
}
6066

6167
@Test

‎kubernetes-itests/src/test/java/io/fabric8/openshift/BuildConfigWatchIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.LoadKubernetesManifests;
1920
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
2021
import io.fabric8.kubernetes.client.Watch;
@@ -37,6 +38,7 @@
3738
import static org.junit.jupiter.api.Assertions.assertNotNull;
3839
import static org.junit.jupiter.api.Assertions.assertTrue;
3940

41+
@KubernetesTest(createEphemeralNamespace = false)
4042
@RequireK8sSupport(BuildConfig.class)
4143
@LoadKubernetesManifests("/build-config-watch.yml")
4244
class BuildConfigWatchIT {

‎kubernetes-itests/src/test/java/io/fabric8/openshift/DeploymentConfigIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.LoadKubernetesManifests;
1920
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
2021
import io.fabric8.openshift.api.model.DeploymentConfig;
@@ -30,6 +31,7 @@
3031
import static org.junit.jupiter.api.Assertions.assertNotNull;
3132
import static org.junit.jupiter.api.Assertions.assertTrue;
3233

34+
@KubernetesTest(createEphemeralNamespace = false)
3335
@RequireK8sSupport(DeploymentConfig.class)
3436
@LoadKubernetesManifests("/deploymentconfig-it.yml")
3537
class DeploymentConfigIT {

‎kubernetes-itests/src/test/java/io/fabric8/openshift/ImageStreamIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.LoadKubernetesManifests;
1920
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
2021
import io.fabric8.openshift.api.model.ImageStream;
@@ -31,6 +32,7 @@
3132
import static org.junit.jupiter.api.Assertions.assertNotNull;
3233
import static org.junit.jupiter.api.Assertions.assertTrue;
3334

35+
@KubernetesTest(createEphemeralNamespace = false)
3436
@RequireK8sSupport(ImageStream.class)
3537
@LoadKubernetesManifests("/imagestream-it.yml")
3638
class ImageStreamIT {

‎kubernetes-itests/src/test/java/io/fabric8/openshift/ImageStreamTagIT.java

+19-17
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.LoadKubernetesManifests;
1920
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
2021
import io.fabric8.openshift.api.model.ImageStreamTag;
@@ -30,6 +31,7 @@
3031
import static org.junit.jupiter.api.Assertions.assertNotNull;
3132
import static org.junit.jupiter.api.Assertions.assertTrue;
3233

34+
@KubernetesTest(createEphemeralNamespace = false)
3335
@RequireK8sSupport(ImageStreamTag.class)
3436
@LoadKubernetesManifests("/imagestreamtag-it.yml")
3537
class ImageStreamTagIT {
@@ -49,63 +51,63 @@ void load() {
4951

5052
@Test
5153
void get() {
52-
client.imageStreams().withName("get").waitUntilCondition(is -> is != null && is.getStatus() != null &&
54+
client.imageStreams().withName("is-tag-get").waitUntilCondition(is -> is != null && is.getStatus() != null &&
5355
is.getStatus().getTags().stream().anyMatch(nt -> nt.getTag().equals("1.0.12")),
5456
30, TimeUnit.SECONDS);
55-
ImageStreamTag getIST = client.imageStreamTags().withName("get:1.0.12").get();
57+
ImageStreamTag getIST = client.imageStreamTags().withName("is-tag-get:1.0.12").get();
5658

5759
assertNotNull(getIST);
58-
assertEquals("get:1.0.12", getIST.getMetadata().getName());
60+
assertEquals("is-tag-get:1.0.12", getIST.getMetadata().getName());
5961
assertEquals("DockerImage", getIST.getTag().getFrom().getKind());
60-
assertEquals("busybox:latest", getIST.getTag().getFrom().getName());
62+
assertEquals("quay.io/quay/busybox:latest", getIST.getTag().getFrom().getName());
6163
}
6264

6365
@Test
6466
void list() {
65-
client.imageStreams().withName("list").waitUntilCondition(is -> is != null && is.getStatus() != null &&
67+
client.imageStreams().withName("is-tag-list").waitUntilCondition(is -> is != null && is.getStatus() != null &&
6668
is.getStatus().getTags().stream().anyMatch(nt -> nt.getTag().equals("1.0.12")),
6769
30, TimeUnit.SECONDS);
6870
ImageStreamTagList istagList = client.imageStreamTags().list();
6971

7072
assertNotNull(istagList);
7173
assertTrue(istagList.getItems().size() >= 1);
7274
Optional<ImageStreamTag> imageStreamTag = istagList.getItems().stream()
73-
.filter(i -> i.getMetadata().getName().equalsIgnoreCase("list:1.0.12")).findFirst();
75+
.filter(i -> i.getMetadata().getName().equalsIgnoreCase("is-tag-list:1.0.12")).findFirst();
7476
assertTrue(imageStreamTag.isPresent());
75-
assertEquals("list:1.0.12", imageStreamTag.get().getMetadata().getName());
77+
assertEquals("is-tag-list:1.0.12", imageStreamTag.get().getMetadata().getName());
7678
assertEquals("DockerImage", imageStreamTag.get().getTag().getFrom().getKind());
77-
assertEquals("busybox:latest", imageStreamTag.get().getTag().getFrom().getName());
79+
assertEquals("quay.io/quay/busybox:latest", imageStreamTag.get().getTag().getFrom().getName());
7880
}
7981

8082
@Test
8183
void update() {
82-
client.imageStreams().withName("update").waitUntilCondition(is -> is != null && is.getStatus() != null &&
84+
client.imageStreams().withName("is-tag-update").waitUntilCondition(is -> is != null && is.getStatus() != null &&
8385
is.getStatus().getTags().stream().anyMatch(nt -> nt.getTag().equals("1.0.12")),
8486
30, TimeUnit.SECONDS);
85-
ImageStreamTag istag2 = new ImageStreamTagBuilder().withNewMetadata().withName("update:1.0.12").endMetadata()
87+
ImageStreamTag istag2 = new ImageStreamTagBuilder().withNewMetadata().withName("is-tag-update:1.0.12").endMetadata()
8688
.withNewTag()
8789
.withNewFrom()
8890
.withKind("DockerImage")
89-
.withName("busybox:latest")
91+
.withName("quay.io/quay/busybox:latest")
9092
.endFrom()
9193
.endTag()
9294
.build();
93-
ImageStreamTag istag = client.imageStreamTags().withName("update:1.0.12").patch(istag2);
95+
ImageStreamTag istag = client.imageStreamTags().withName("is-tag-update:1.0.12").patch(istag2);
9496

9597
assertNotNull(istag);
96-
assertEquals("update:1.0.12", istag.getMetadata().getName());
98+
assertEquals("is-tag-update:1.0.12", istag.getMetadata().getName());
9799
assertEquals("DockerImage", istag.getTag().getFrom().getKind());
98-
assertEquals("busybox:latest", istag.getTag().getFrom().getName());
100+
assertEquals("quay.io/quay/busybox:latest", istag.getTag().getFrom().getName());
99101
}
100102

101103
@Test
102104
void delete() {
103-
client.imageStreams().withName("delete").waitUntilCondition(is -> is != null && is.getStatus() != null &&
105+
client.imageStreams().withName("is-tag-delete").waitUntilCondition(is -> is != null && is.getStatus() != null &&
104106
is.getStatus().getTags().stream().anyMatch(nt -> nt.getTag().equals("1.0.12")),
105107
30, TimeUnit.SECONDS);
106-
boolean deleted = client.imageStreamTags().withName("delete:1.0.12").delete().size() == 1;
108+
boolean deleted = client.imageStreamTags().withName("is-tag-delete:1.0.12").delete().size() == 1;
107109
assertTrue(deleted);
108-
client.imageStreamTags().withName("delete:1.0.12")
110+
client.imageStreamTags().withName("is-tag-delete:1.0.12")
109111
.waitUntilCondition(r -> r == null || r.getMetadata().getDeletionTimestamp() != null, 30, TimeUnit.SECONDS);
110112
}
111113

‎kubernetes-itests/src/test/java/io/fabric8/openshift/K8sAuthorizationOnOpenShiftIT.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
1920
import io.fabric8.kubernetes.api.model.Namespace;
2021
import io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview;
@@ -38,13 +39,12 @@
3839
import static org.junit.jupiter.api.Assertions.assertNotNull;
3940
import static org.junit.jupiter.api.Assertions.assertTrue;
4041

42+
@KubernetesTest(createEphemeralNamespace = false)
4143
@RequireK8sSupport(Project.class)
4244
class K8sAuthorizationOnOpenShiftIT {
4345

4446
OpenShiftClient client;
4547

46-
Namespace namespace;
47-
4848
@Test
4949
void createRoleK8s() {
5050
// Given
@@ -151,7 +151,7 @@ void createClusterRoleK8s() {
151151
void createLocalSubjectAccessReview() {
152152
// Given
153153
User currentUser = client.currentUser();
154-
String ns = namespace.getMetadata().getName();
154+
String ns = client.getConfiguration().getNamespace();
155155
LocalSubjectAccessReview lsar = new LocalSubjectAccessReviewBuilder()
156156
.withNewMetadata().withNamespace(ns).endMetadata()
157157
.withNewSpec()
@@ -177,10 +177,11 @@ void createLocalSubjectAccessReview() {
177177
void createSubjectAccessReview() {
178178
// Given
179179
String user = client.currentUser().getMetadata().getName();
180+
String ns = client.getConfiguration().getNamespace();
180181
SubjectAccessReview sar = new SubjectAccessReviewBuilder()
181182
.withNewSpec()
182183
.withNewResourceAttributes()
183-
.withNamespace(namespace.getMetadata().getName())
184+
.withNamespace(ns)
184185
.withVerb("get")
185186
.withResource("pods")
186187
.endResourceAttributes()

‎kubernetes-itests/src/test/java/io/fabric8/openshift/OpenShiftAuthorizationIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
1920
import io.fabric8.kubernetes.api.model.Namespace;
2021
import io.fabric8.openshift.api.model.LocalResourceAccessReview;
@@ -40,6 +41,7 @@
4041
import static org.junit.jupiter.api.Assertions.assertNotNull;
4142
import static org.junit.jupiter.api.Assertions.assertTrue;
4243

44+
@KubernetesTest(createEphemeralNamespace = false)
4345
@RequireK8sSupport(RoleBindingRestriction.class)
4446
class OpenShiftAuthorizationIT {
4547

‎kubernetes-itests/src/test/java/io/fabric8/openshift/ProjectIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
1920
import io.fabric8.kubernetes.api.model.HasMetadata;
2021
import io.fabric8.openshift.api.model.Project;
@@ -28,6 +29,7 @@
2829
import static org.junit.jupiter.api.Assertions.assertNotNull;
2930
import static org.junit.jupiter.api.Assertions.assertTrue;
3031

32+
@KubernetesTest(createEphemeralNamespace = false)
3133
@RequireK8sSupport(Project.class)
3234
class ProjectIT {
3335

‎kubernetes-itests/src/test/java/io/fabric8/openshift/ProjectRequestIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
1920
import io.fabric8.openshift.api.model.Project;
2021
import io.fabric8.openshift.api.model.ProjectRequest;
@@ -28,6 +29,7 @@
2829
import static org.junit.jupiter.api.Assertions.assertEquals;
2930
import static org.junit.jupiter.api.Assertions.assertNotNull;
3031

32+
@KubernetesTest(createEphemeralNamespace = false)
3133
@RequireK8sSupport(ProjectRequest.class)
3234
class ProjectRequestIT {
3335

‎kubernetes-itests/src/test/java/io/fabric8/openshift/RouteIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.LoadKubernetesManifests;
1920
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
2021
import io.fabric8.openshift.api.model.Route;
@@ -32,6 +33,7 @@
3233
import static org.junit.jupiter.api.Assertions.assertNotNull;
3334
import static org.junit.jupiter.api.Assertions.assertTrue;
3435

36+
@KubernetesTest(createEphemeralNamespace = false)
3537
@RequireK8sSupport(Route.class)
3638
@LoadKubernetesManifests("/route-it.yml")
3739
class RouteIT {

‎kubernetes-itests/src/test/java/io/fabric8/openshift/SecurityContextConstraintsIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.LoadKubernetesManifests;
1920
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
2021
import io.fabric8.openshift.api.model.SecurityContextConstraints;
@@ -30,6 +31,7 @@
3031
import static org.junit.jupiter.api.Assertions.assertNotNull;
3132
import static org.junit.jupiter.api.Assertions.assertTrue;
3233

34+
@KubernetesTest(createEphemeralNamespace = false)
3335
@RequireK8sSupport(SecurityContextConstraints.class)
3436
@LoadKubernetesManifests("/securitycontextconstraints-it.yml")
3537
class SecurityContextConstraintsIT {

‎kubernetes-itests/src/test/java/io/fabric8/openshift/SelfSubjectAccessReviewIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
1920
import io.fabric8.kubernetes.api.model.Namespace;
2021
import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview;
@@ -25,6 +26,7 @@
2526

2627
import static org.junit.jupiter.api.Assertions.assertTrue;
2728

29+
@KubernetesTest(createEphemeralNamespace = false)
2830
@RequireK8sSupport(Project.class)
2931
class SelfSubjectAccessReviewIT {
3032

‎kubernetes-itests/src/test/java/io/fabric8/openshift/ServiceToURLIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.fabric8.openshift;
1717

18+
import io.fabric8.junit.jupiter.api.KubernetesTest;
1819
import io.fabric8.junit.jupiter.api.RequireK8sSupport;
1920
import io.fabric8.kubernetes.api.model.IntOrString;
2021
import io.fabric8.kubernetes.api.model.Service;
@@ -30,6 +31,7 @@
3031

3132
import static org.junit.jupiter.api.Assertions.assertNotNull;
3233

34+
@KubernetesTest(createEphemeralNamespace = false)
3335
@RequireK8sSupport(Route.class)
3436
class ServiceToURLIT {
3537

0 commit comments

Comments
 (0)