From ff5bf5d6aed8724bbd8432c398c8b79533c49799 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 9 Jul 2024 17:35:37 +0300 Subject: [PATCH] Enable early jdk8 test (#11777) --- .../workflows/publish-smoke-test-early-jdk8-images.yml | 6 +----- .../io/opentelemetry/smoketest/CrashEarlyJdk8Test.groovy | 9 +-------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish-smoke-test-early-jdk8-images.yml b/.github/workflows/publish-smoke-test-early-jdk8-images.yml index 0a2687b12f58..3cff3f2bf689 100644 --- a/.github/workflows/publish-smoke-test-early-jdk8-images.yml +++ b/.github/workflows/publish-smoke-test-early-jdk8-images.yml @@ -46,8 +46,4 @@ jobs: if: always() uses: ./.github/workflows/reusable-workflow-notification.yml with: - success: >- - ${{ - needs.publishLinux.result == 'success' && - needs.publishWindows.result == 'success' - }} + success: ${{ needs.publish.result == 'success' }} diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/CrashEarlyJdk8Test.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/CrashEarlyJdk8Test.groovy index e1aefc5b128d..c6f79a2fea6d 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/CrashEarlyJdk8Test.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/CrashEarlyJdk8Test.groovy @@ -13,7 +13,6 @@ import org.testcontainers.containers.output.Slf4jLogConsumer import org.testcontainers.containers.wait.strategy.Wait import org.testcontainers.utility.DockerImageName import org.testcontainers.utility.MountableFile -import spock.lang.Ignore import spock.lang.IgnoreIf import spock.lang.Specification @@ -25,12 +24,6 @@ import static io.opentelemetry.smoketest.TestContainerManager.useWindowsContaine // java.lang.invoke.CallSite // This test verifies that such jvm does not crash with opentelemetry agent @IgnoreIf({ useWindowsContainers() }) -// com.github.dockerjava.api.exception.DockerClientException: Could not pull image: [DEPRECATION NOTICE] -// Docker Image Format v1 and Docker Image manifest version 2, schema 1 support is disabled by default -// and will be removed in an upcoming release. Suggest the author of docker.io/azul/zulu-openjdk:8u31 -// to upgrade the image to the OCI Format or Docker Image manifest v2, schema 2. More information -// at https://docs.docker.com/go/deprecated-image-specs/ -@Ignore class CrashEarlyJdk8Test extends Specification { private static final Logger logger = LoggerFactory.getLogger(CrashEarlyJdk8Test) @@ -40,7 +33,7 @@ class CrashEarlyJdk8Test extends Specification { def "test crash on early jdk8"() { setup: GenericContainer target = - new GenericContainer<>(DockerImageName.parse("azul/zulu-openjdk:8u31")) + new GenericContainer<>(DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:20240709.9848833570")) .withStartupTimeout(Duration.ofMinutes(5)) .withLogConsumer(new Slf4jLogConsumer(logger)) .withCopyFileToContainer(