From d10c2805a7831ba69ad15d5242e961b71d3757b3 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Fri, 4 Aug 2023 12:47:01 +0200 Subject: [PATCH] feat: Gradle tests executed with latest Gradle (v8.2.1) --- .github/workflows/e2e-tests.yml | 10 ++++++-- it/pom.xml | 14 ++++++++--- .../jkube/integrationtests/JKubeCase.java | 1 + .../api/extension/GradleExtension.java | 5 ++-- pom.xml | 24 ++++++++++--------- 5 files changed, 36 insertions(+), 18 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 120f25d0..4c93be51 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -40,11 +40,13 @@ jobs: disable-sudo: true egress-policy: block allowed-endpoints: > + downloads.gradle.org:443 github.com:443 repo.gradle.org:443 repo.maven.apache.org:443 repo1.maven.org:443 repository.jboss.org:443 + services.gradle.org:443 - name: Checkout uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: Setup Java 11 @@ -111,6 +113,7 @@ jobs: auth.docker.io:443 azure.archive.ubuntu.com:80 cdn03.quay.io:443 + downloads.gradle.org:443 gcr.io:443 github.com:443 jcenter.bintray.com:443 @@ -127,6 +130,7 @@ jobs: ppa.launchpad.net:80 production.cloudflare.docker.com:443 quay.io:443 + services.gradle.org:443 registry-1.docker.io:443 registry.access.redhat.com:443 registry.k8s.io:443 @@ -187,6 +191,7 @@ jobs: auth.docker.io:443 azure.archive.ubuntu.com:80 cdn03.quay.io:443 + downloads.gradle.org:443 gcr.io:443 github.com:443 jcenter.bintray.com:443 @@ -203,6 +208,7 @@ jobs: ppa.launchpad.net:80 production.cloudflare.docker.com:443 quay.io:443 + services.gradle.org:443 registry-1.docker.io:443 registry.access.redhat.com:443 registry.k8s.io:443 @@ -234,7 +240,7 @@ jobs: openshift: [v3.11.0,v3.10.0] suite: ['quarkus','springboot','webapp','other'] steps: -# This seems to cause problems with OpenShift Setup Action +# This seems to cause problems with OpenShift Setup Action # - name: Harden Runner # uses: step-security/harden-runner@97689868c8aca5a4bcd16ab96bbda25a0efb734b # with: @@ -275,7 +281,7 @@ jobs: ./jkube key: cache-it-${{ github.run_id }} - name: Check Docker Status - run: systemctl status docker.service + run: systemctl status docker.service - name: Setup OpenShift uses: manusa/actions-setup-openshift@e59fe3caa18d7cde81e2ce4797e6549a13f7648c with: diff --git a/it/pom.xml b/it/pom.xml index 7e67a880..db01c081 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -67,11 +67,15 @@ org.gradle - gradle-test-kit + gradle-all + ${gradle.version} - org.gradle - gradle-tooling-api + + com.google.guava + guava + ${guava.version} + test org.slf4j @@ -112,6 +116,10 @@ jkubeVersion ${jkube.version} + + gradleVersion + ${gradle.version} + diff --git a/it/src/main/java/org/eclipse/jkube/integrationtests/JKubeCase.java b/it/src/main/java/org/eclipse/jkube/integrationtests/JKubeCase.java index ef2804ec..066fb650 100644 --- a/it/src/main/java/org/eclipse/jkube/integrationtests/JKubeCase.java +++ b/it/src/main/java/org/eclipse/jkube/integrationtests/JKubeCase.java @@ -27,6 +27,7 @@ public interface JKubeCase { String JKUBE_VERSION_SYSTEM_PROPERTY = "jkubeVersion"; + String GRADLE_VERSION_SYSTEM_PROPERTY = "gradleVersion"; // TODO: Move to KubernetesCase interface KubernetesClient getKubernetesClient(); diff --git a/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/GradleExtension.java b/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/GradleExtension.java index 20c4b185..4550d160 100644 --- a/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/GradleExtension.java +++ b/it/src/main/java/org/eclipse/jkube/integrationtests/jupiter/api/extension/GradleExtension.java @@ -34,6 +34,8 @@ import java.util.List; import java.util.function.Predicate; +import static org.eclipse.jkube.integrationtests.JKubeCase.GRADLE_VERSION_SYSTEM_PROPERTY; + public class GradleExtension implements BaseExtension, BeforeAllCallback, BeforeEachCallback { private volatile boolean cleanBuild = false; @@ -72,8 +74,7 @@ private JKubeGradleRunner getJKubeGradleRunner(ExtensionContext context) throws } var projectPath = rootPath.resolve("projects-to-be-tested").resolve("gradle"); var gradleRunner = GradleRunner.create() - .withGradleDistribution(new URI("https://services.gradle.org/distributions/gradle-7.6-bin.zip")) -// .withGradleInstallation(getGradleInstallation()) + .withGradleDistribution(new URI("https://services.gradle.org/distributions/gradle-" + System.getProperty(GRADLE_VERSION_SYSTEM_PROPERTY) + "-bin.zip")) .withProjectDir(projectPath.toFile()); if (annotation.forwardOutput()) { gradleRunner.forwardOutput(); diff --git a/pom.xml b/pom.xml index 23adb526..19fc10e7 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,9 @@ 2.15.2 2.15.2 6.8.0 - 6.1.1 + 32.1.2-jre + 8.2.1 + 0.0.2 2.0.0.0 1.14-SNAPSHOT 5.9.1 @@ -121,16 +123,6 @@ commons-codec ${apache.commons-codec.version} - - org.gradle - gradle-test-kit - ${gradle.version} - - - org.gradle - gradle-tooling-api - ${gradle.version} - org.slf4j slf4j-simple @@ -175,6 +167,11 @@ license-maven-plugin ${license-maven-plugin.version} + + com.marcnuri.plugins + gradle-api-maven-plugin + ${gradle-api-maven-plugin-version} + io.reactiverse vertx-maven-plugin @@ -262,6 +259,11 @@ + + com.marcnuri.plugins + gradle-api-maven-plugin + true +