From 7b0c1e995f8bd2e18e8107c9ed012a0a97ecdfe9 Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Thu, 23 Jul 2026 00:11:52 +0600 Subject: [PATCH 01/11] fix regression for python integration tests --- .../blackduck/integration/detect/battery/docker/PipTest.java | 4 ++-- .../integration/detect/battery/docker/PipenvTest.java | 2 +- .../integration/detect/battery/docker/SetuptoolsTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java index caa5d00e45..1a27fbed5e 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java @@ -42,7 +42,7 @@ private static Stream providePipPkgResourcesVersionsToTest() { @ParameterizedTest @MethodSource("providePipVersionsToTest") public void pipExecutableTest(String pipVersion) throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("pip-docker-test", "pip-docker-test:" + pipVersion)) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("pip-docker-test", "pip-docker-test:" + pipVersion + "-j11")) { Map pipDockerfileArgs = new HashMap<>(); pipDockerfileArgs.put("PIP_VERSION", pipVersion); @@ -140,7 +140,7 @@ private void validateComponentsForSamplePipPkgProject(BlackDuckAssertions blackd @Test public void pythonHybridTest() throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("python-hybrid-test", "python-hybrid-test:1.0.0" )) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("python-hybrid-test", "python-hybrid-test:1.0.0-j11")) { Map dockerfileArgs = new HashMap<>(); dockerfileArgs.put("ARTIFACTORY_URL", ARTIFACTORY_URL); diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java index b1ce1a0bea..1a91306be1 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java @@ -36,7 +36,7 @@ private static Stream providePipenvVersionsToTest() { @ParameterizedTest @MethodSource("providePipenvVersionsToTest") public void pipenvExecutableTest(String pipenvVersion) throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("pipenv-docker-test", "pipenv-docker-test:" + pipenvVersion)) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("pipenv-docker-test", "pipenv-docker-test:" + pipenvVersion + "-j11")) { Map pipenvDockerfileArgs = new HashMap<>(); pipenvDockerfileArgs.put("PIPENV_VERSION_VAL", pipenvVersion); diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java index cfdd8adf29..e125d4c825 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java @@ -36,7 +36,7 @@ private static Stream provideSetuptoolsVersionsToTest() { @ParameterizedTest @MethodSource("provideSetuptoolsVersionsToTest") public void setuptoolsExecutableTest(String setuptoolsVersion) throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("setuptools-docker-test ", "setuptools-docker-test:" + setuptoolsVersion)) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("setuptools-docker-test", "setuptools-docker-test:" + setuptoolsVersion + "-j11")) { Map setuptoolsDockerfileArgs = new HashMap<>(); setuptoolsDockerfileArgs.put("ARTIFACTORY_URL", ARTIFACTORY_URL); From 33761879d4c46f33ad8f4a99e9e1814070fd42de Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Thu, 23 Jul 2026 20:20:00 +0600 Subject: [PATCH 02/11] revert dockerfile changes for pip version upgrade --- .../blackduck/integration/detect/battery/docker/PipTest.java | 2 +- src/test/resources/docker/Pip.dockerfile | 2 +- src/test/resources/docker/Setuptools.dockerfile | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java index 1a27fbed5e..7569cf110e 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java @@ -42,7 +42,7 @@ private static Stream providePipPkgResourcesVersionsToTest() { @ParameterizedTest @MethodSource("providePipVersionsToTest") public void pipExecutableTest(String pipVersion) throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("pip-docker-test", "pip-docker-test:" + pipVersion + "-j11")) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("pip-docker-test", "pip-docker-test:" + pipVersion + "-j11-apt")) { Map pipDockerfileArgs = new HashMap<>(); pipDockerfileArgs.put("PIP_VERSION", pipVersion); diff --git a/src/test/resources/docker/Pip.dockerfile b/src/test/resources/docker/Pip.dockerfile index 19ef493f42..ca631c0e81 100644 --- a/src/test/resources/docker/Pip.dockerfile +++ b/src/test/resources/docker/Pip.dockerfile @@ -13,7 +13,7 @@ ENV JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2" RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip -RUN pip install --upgrade "pip==${PIP_VERSION}" +RUN ln -s /usr/bin/pip3 /usr/local/bin/pip # Set up test project RUN mkdir -p ${SRC_DIR} diff --git a/src/test/resources/docker/Setuptools.dockerfile b/src/test/resources/docker/Setuptools.dockerfile index fb65ca72d5..1bd7eb6507 100644 --- a/src/test/resources/docker/Setuptools.dockerfile +++ b/src/test/resources/docker/Setuptools.dockerfile @@ -14,8 +14,7 @@ ENV JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2" RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip -RUN pip install --upgrade "pip==${PIP_VERSION}" -RUN pip install --upgrade "setuptools==${SETUPTOOLS_VERSION}" +RUN ln -s /usr/bin/pip3 /usr/local/bin/pip # Set up test project RUN mkdir -p ${SRC_DIR} From 800158b1e281de5b1d56a8e3436ccf20455ff5bd Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Thu, 23 Jul 2026 21:42:11 +0600 Subject: [PATCH 03/11] update package manager versions targeting internal artifactory --- .../integration/detect/battery/docker/PipenvTest.java | 2 +- .../integration/detect/battery/docker/SetuptoolsTest.java | 2 +- src/test/resources/docker/Pipenv.dockerfile | 2 +- src/test/resources/docker/Setuptools.dockerfile | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java index 1a91306be1..a5541f43ed 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java @@ -24,7 +24,7 @@ @Tag("integration") public class PipenvTest { - private static final String[] PIPENV_VERSIONS_TO_TEST = new String[] { "2024.0.1" }; + private static final String[] PIPENV_VERSIONS_TO_TEST = new String[] { "2026.5.2" }; public static String ARTIFACTORY_URL = System.getenv().get("SNPS_INTERNAL_ARTIFACTORY"); private static final String PROJECT_NAME = "pipenv-docker-test-project"; diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java index e125d4c825..e4d7a24fb0 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java @@ -23,7 +23,7 @@ @Tag("integration") public class SetuptoolsTest { - private static final String[] SETUPTOOLS_VERSIONS_TO_TEST = new String[] { "74.0.0" }; + private static final String[] SETUPTOOLS_VERSIONS_TO_TEST = new String[] { "80.9.0" }; private static final String PIP_VERSION = "24.2"; public static String ARTIFACTORY_URL = System.getenv().get("SNPS_INTERNAL_ARTIFACTORY"); diff --git a/src/test/resources/docker/Pipenv.dockerfile b/src/test/resources/docker/Pipenv.dockerfile index d634e49b54..c96fd9c3ea 100644 --- a/src/test/resources/docker/Pipenv.dockerfile +++ b/src/test/resources/docker/Pipenv.dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:11-jdk-jammy # Note: Intentionally using the argument name as PIPENV_VERSION_VAL instead of PIPENV_VERSION as the latter # conflicts with the `click` Python package's options and causes `pipenv install` to result in an error. -ARG PIPENV_VERSION_VAL="2024.0.1" +ARG PIPENV_VERSION_VAL="2026.5.2" ARG ARTIFACTORY_URL ENV PIP_INDEX_URL="${ARTIFACTORY_URL}/artifactory/api/pypi/pypi-virtual/simple/" diff --git a/src/test/resources/docker/Setuptools.dockerfile b/src/test/resources/docker/Setuptools.dockerfile index 1bd7eb6507..3331de44ce 100644 --- a/src/test/resources/docker/Setuptools.dockerfile +++ b/src/test/resources/docker/Setuptools.dockerfile @@ -3,7 +3,7 @@ FROM eclipse-temurin:11-jdk-jammy ARG ARTIFACTORY_URL ENV PIP_INDEX_URL="${ARTIFACTORY_URL}/artifactory/api/pypi/pypi-virtual/simple/" ARG PIP_VERSION="24.2" -ARG SETUPTOOLS_VERSION="74.0.0" +ARG SETUPTOOLS_VERSION="80.9.0" # Do not change SRC_DIR, value is expected by tests ENV SRC_DIR=/opt/project/src @@ -15,6 +15,7 @@ RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip RUN ln -s /usr/bin/pip3 /usr/local/bin/pip +RUN pip install --upgrade "setuptools==${SETUPTOOLS_VERSION}" # Set up test project RUN mkdir -p ${SRC_DIR} From ba138466f89d891393f2c2ae5eaed26a2e65f83b Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Thu, 23 Jul 2026 23:35:48 +0600 Subject: [PATCH 04/11] revert dockerfile to original --- .../integration/detect/battery/docker/PipTest.java | 4 ++-- .../integration/detect/battery/docker/PipenvTest.java | 4 ++-- .../integration/detect/battery/docker/SetuptoolsTest.java | 4 ++-- src/test/resources/docker/Pip.dockerfile | 2 +- src/test/resources/docker/Pipenv.dockerfile | 2 +- src/test/resources/docker/Setuptools.dockerfile | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java index 7569cf110e..a317ba79a2 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java @@ -42,7 +42,7 @@ private static Stream providePipPkgResourcesVersionsToTest() { @ParameterizedTest @MethodSource("providePipVersionsToTest") public void pipExecutableTest(String pipVersion) throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("pip-docker-test", "pip-docker-test:" + pipVersion + "-j11-apt")) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("pip-docker-test", "pip-docker-test:" + pipVersion + "-jdk11")) { Map pipDockerfileArgs = new HashMap<>(); pipDockerfileArgs.put("PIP_VERSION", pipVersion); @@ -140,7 +140,7 @@ private void validateComponentsForSamplePipPkgProject(BlackDuckAssertions blackd @Test public void pythonHybridTest() throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("python-hybrid-test", "python-hybrid-test:1.0.0-j11")) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("python-hybrid-test", "python-hybrid-test:1.0.0-jdk11")) { Map dockerfileArgs = new HashMap<>(); dockerfileArgs.put("ARTIFACTORY_URL", ARTIFACTORY_URL); diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java index a5541f43ed..de0671076a 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java @@ -24,7 +24,7 @@ @Tag("integration") public class PipenvTest { - private static final String[] PIPENV_VERSIONS_TO_TEST = new String[] { "2026.5.2" }; + private static final String[] PIPENV_VERSIONS_TO_TEST = new String[] { "2024.0.1" }; public static String ARTIFACTORY_URL = System.getenv().get("SNPS_INTERNAL_ARTIFACTORY"); private static final String PROJECT_NAME = "pipenv-docker-test-project"; @@ -36,7 +36,7 @@ private static Stream providePipenvVersionsToTest() { @ParameterizedTest @MethodSource("providePipenvVersionsToTest") public void pipenvExecutableTest(String pipenvVersion) throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("pipenv-docker-test", "pipenv-docker-test:" + pipenvVersion + "-j11")) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("pipenv-docker-test", "pipenv-docker-test:" + pipenvVersion + "-jdk11")) { Map pipenvDockerfileArgs = new HashMap<>(); pipenvDockerfileArgs.put("PIPENV_VERSION_VAL", pipenvVersion); diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java index e4d7a24fb0..b366cf4b8c 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java @@ -23,7 +23,7 @@ @Tag("integration") public class SetuptoolsTest { - private static final String[] SETUPTOOLS_VERSIONS_TO_TEST = new String[] { "80.9.0" }; + private static final String[] SETUPTOOLS_VERSIONS_TO_TEST = new String[] { "74.0.0" }; private static final String PIP_VERSION = "24.2"; public static String ARTIFACTORY_URL = System.getenv().get("SNPS_INTERNAL_ARTIFACTORY"); @@ -36,7 +36,7 @@ private static Stream provideSetuptoolsVersionsToTest() { @ParameterizedTest @MethodSource("provideSetuptoolsVersionsToTest") public void setuptoolsExecutableTest(String setuptoolsVersion) throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("setuptools-docker-test", "setuptools-docker-test:" + setuptoolsVersion + "-j11")) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("setuptools-docker-test", "setuptools-docker-test:" + setuptoolsVersion + "-jdk11")) { Map setuptoolsDockerfileArgs = new HashMap<>(); setuptoolsDockerfileArgs.put("ARTIFACTORY_URL", ARTIFACTORY_URL); diff --git a/src/test/resources/docker/Pip.dockerfile b/src/test/resources/docker/Pip.dockerfile index ca631c0e81..19ef493f42 100644 --- a/src/test/resources/docker/Pip.dockerfile +++ b/src/test/resources/docker/Pip.dockerfile @@ -13,7 +13,7 @@ ENV JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2" RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip -RUN ln -s /usr/bin/pip3 /usr/local/bin/pip +RUN pip install --upgrade "pip==${PIP_VERSION}" # Set up test project RUN mkdir -p ${SRC_DIR} diff --git a/src/test/resources/docker/Pipenv.dockerfile b/src/test/resources/docker/Pipenv.dockerfile index c96fd9c3ea..d634e49b54 100644 --- a/src/test/resources/docker/Pipenv.dockerfile +++ b/src/test/resources/docker/Pipenv.dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:11-jdk-jammy # Note: Intentionally using the argument name as PIPENV_VERSION_VAL instead of PIPENV_VERSION as the latter # conflicts with the `click` Python package's options and causes `pipenv install` to result in an error. -ARG PIPENV_VERSION_VAL="2026.5.2" +ARG PIPENV_VERSION_VAL="2024.0.1" ARG ARTIFACTORY_URL ENV PIP_INDEX_URL="${ARTIFACTORY_URL}/artifactory/api/pypi/pypi-virtual/simple/" diff --git a/src/test/resources/docker/Setuptools.dockerfile b/src/test/resources/docker/Setuptools.dockerfile index 3331de44ce..10bf604f94 100644 --- a/src/test/resources/docker/Setuptools.dockerfile +++ b/src/test/resources/docker/Setuptools.dockerfile @@ -3,7 +3,7 @@ FROM eclipse-temurin:11-jdk-jammy ARG ARTIFACTORY_URL ENV PIP_INDEX_URL="${ARTIFACTORY_URL}/artifactory/api/pypi/pypi-virtual/simple/" ARG PIP_VERSION="24.2" -ARG SETUPTOOLS_VERSION="80.9.0" +ARG SETUPTOOLS_VERSION="74.0.0" # Do not change SRC_DIR, value is expected by tests ENV SRC_DIR=/opt/project/src @@ -14,7 +14,7 @@ ENV JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2" RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip -RUN ln -s /usr/bin/pip3 /usr/local/bin/pip +RUN pip install --upgrade "pip==${PIP_VERSION}" RUN pip install --upgrade "setuptools==${SETUPTOOLS_VERSION}" # Set up test project @@ -24,4 +24,4 @@ RUN wget ${ARTIFACTORY_URL}/artifactory/detect-generic-qa-local/setuptools-test- RUN unzip setuptools-test-project.zip -d /opt/project/src RUN mv setuptools-test-project/* . RUN rm -r setuptools-test-project setuptools-test-project.zip -RUN /bin/sh -c "pip install ." \ No newline at end of file +RUN /bin/sh -c "pip install ." From d57f494f07667ab81be439d7b0632a1d5200e3ea Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Fri, 24 Jul 2026 00:55:45 +0600 Subject: [PATCH 05/11] add symlink --- src/test/resources/docker/Pip.dockerfile | 2 +- src/test/resources/docker/Setuptools.dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/docker/Pip.dockerfile b/src/test/resources/docker/Pip.dockerfile index 19ef493f42..ca631c0e81 100644 --- a/src/test/resources/docker/Pip.dockerfile +++ b/src/test/resources/docker/Pip.dockerfile @@ -13,7 +13,7 @@ ENV JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2" RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip -RUN pip install --upgrade "pip==${PIP_VERSION}" +RUN ln -s /usr/bin/pip3 /usr/local/bin/pip # Set up test project RUN mkdir -p ${SRC_DIR} diff --git a/src/test/resources/docker/Setuptools.dockerfile b/src/test/resources/docker/Setuptools.dockerfile index 10bf604f94..9d32438cf0 100644 --- a/src/test/resources/docker/Setuptools.dockerfile +++ b/src/test/resources/docker/Setuptools.dockerfile @@ -14,7 +14,7 @@ ENV JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2" RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip -RUN pip install --upgrade "pip==${PIP_VERSION}" +RUN ln -s /usr/bin/pip3 /usr/local/bin/pip RUN pip install --upgrade "setuptools==${SETUPTOOLS_VERSION}" # Set up test project From fd27ec10c1dce5d234c62223b294d27345ed1399 Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Fri, 24 Jul 2026 01:43:49 +0600 Subject: [PATCH 06/11] add no build isolation --- src/test/resources/docker/Setuptools.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/docker/Setuptools.dockerfile b/src/test/resources/docker/Setuptools.dockerfile index 9d32438cf0..955b3659b5 100644 --- a/src/test/resources/docker/Setuptools.dockerfile +++ b/src/test/resources/docker/Setuptools.dockerfile @@ -24,4 +24,4 @@ RUN wget ${ARTIFACTORY_URL}/artifactory/detect-generic-qa-local/setuptools-test- RUN unzip setuptools-test-project.zip -d /opt/project/src RUN mv setuptools-test-project/* . RUN rm -r setuptools-test-project setuptools-test-project.zip -RUN /bin/sh -c "pip install ." +RUN /bin/sh -c "pip install --no-build-isolation ." From 819c40d8b6bd13ac548f8926262337defaf775eb Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Fri, 24 Jul 2026 11:32:24 +0600 Subject: [PATCH 07/11] disable setuptools test --- .../integration/detect/battery/docker/SetuptoolsTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java index b366cf4b8c..35c5ee7c48 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.stream.Stream; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -22,6 +23,7 @@ import com.blackduck.integration.exception.IntegrationException; @Tag("integration") +@Disabled("Disabled: Dockerfile pulls from public PyPI registry — re-enable after migrating to internal artifact proxy") public class SetuptoolsTest { private static final String[] SETUPTOOLS_VERSIONS_TO_TEST = new String[] { "74.0.0" }; private static final String PIP_VERSION = "24.2"; From 602b292fa86c9c2ff4ab2abc020820a93d9a993f Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Fri, 24 Jul 2026 15:04:19 +0600 Subject: [PATCH 08/11] enable setuptools test, version tag add --- .../integration/detect/battery/docker/SetuptoolsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java index 35c5ee7c48..09a5b7d7f8 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java @@ -23,7 +23,7 @@ import com.blackduck.integration.exception.IntegrationException; @Tag("integration") -@Disabled("Disabled: Dockerfile pulls from public PyPI registry — re-enable after migrating to internal artifact proxy") +//@Disabled("Disabled: Dockerfile pulls from public PyPI registry — re-enable after migrating to internal artifact proxy") public class SetuptoolsTest { private static final String[] SETUPTOOLS_VERSIONS_TO_TEST = new String[] { "74.0.0" }; private static final String PIP_VERSION = "24.2"; @@ -38,7 +38,7 @@ private static Stream provideSetuptoolsVersionsToTest() { @ParameterizedTest @MethodSource("provideSetuptoolsVersionsToTest") public void setuptoolsExecutableTest(String setuptoolsVersion) throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("setuptools-docker-test", "setuptools-docker-test:" + setuptoolsVersion + "-jdk11")) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("setuptools-docker-test", "setuptools-docker-test:" + setuptoolsVersion + "-jdk11v2")) { Map setuptoolsDockerfileArgs = new HashMap<>(); setuptoolsDockerfileArgs.put("ARTIFACTORY_URL", ARTIFACTORY_URL); From 73b794ab7db1b2f86b176fa10ee3eeb8c7e12513 Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Sat, 25 Jul 2026 18:30:44 +0600 Subject: [PATCH 09/11] add cache busting with version change, revert dockerfile changes --- .../blackduck/integration/detect/battery/docker/PipTest.java | 2 +- src/test/resources/docker/Pip.dockerfile | 2 +- src/test/resources/docker/Setuptools.dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java index a317ba79a2..a2549b030f 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java @@ -140,7 +140,7 @@ private void validateComponentsForSamplePipPkgProject(BlackDuckAssertions blackd @Test public void pythonHybridTest() throws IntegrationException, IOException { - try (DetectDockerTestRunner test = new DetectDockerTestRunner("python-hybrid-test", "python-hybrid-test:1.0.0-jdk11")) { + try (DetectDockerTestRunner test = new DetectDockerTestRunner("python-hybrid-test", "python-hybrid-test:1.0.1-jdk11")) { Map dockerfileArgs = new HashMap<>(); dockerfileArgs.put("ARTIFACTORY_URL", ARTIFACTORY_URL); diff --git a/src/test/resources/docker/Pip.dockerfile b/src/test/resources/docker/Pip.dockerfile index ca631c0e81..19ef493f42 100644 --- a/src/test/resources/docker/Pip.dockerfile +++ b/src/test/resources/docker/Pip.dockerfile @@ -13,7 +13,7 @@ ENV JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2" RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip -RUN ln -s /usr/bin/pip3 /usr/local/bin/pip +RUN pip install --upgrade "pip==${PIP_VERSION}" # Set up test project RUN mkdir -p ${SRC_DIR} diff --git a/src/test/resources/docker/Setuptools.dockerfile b/src/test/resources/docker/Setuptools.dockerfile index 955b3659b5..10bf604f94 100644 --- a/src/test/resources/docker/Setuptools.dockerfile +++ b/src/test/resources/docker/Setuptools.dockerfile @@ -14,7 +14,7 @@ ENV JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2" RUN apt-get update -y RUN apt-get install -y git bash wget unzip RUN apt-get install -y python3 python3-pip -RUN ln -s /usr/bin/pip3 /usr/local/bin/pip +RUN pip install --upgrade "pip==${PIP_VERSION}" RUN pip install --upgrade "setuptools==${SETUPTOOLS_VERSION}" # Set up test project @@ -24,4 +24,4 @@ RUN wget ${ARTIFACTORY_URL}/artifactory/detect-generic-qa-local/setuptools-test- RUN unzip setuptools-test-project.zip -d /opt/project/src RUN mv setuptools-test-project/* . RUN rm -r setuptools-test-project setuptools-test-project.zip -RUN /bin/sh -c "pip install --no-build-isolation ." +RUN /bin/sh -c "pip install ." From 01022cfee6e19d9faea58435e26665577da3b0d4 Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Sat, 25 Jul 2026 18:31:58 +0600 Subject: [PATCH 10/11] cleanup commented out code --- .../integration/detect/battery/docker/SetuptoolsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java index 09a5b7d7f8..e0882dfc6a 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java @@ -23,7 +23,6 @@ import com.blackduck.integration.exception.IntegrationException; @Tag("integration") -//@Disabled("Disabled: Dockerfile pulls from public PyPI registry — re-enable after migrating to internal artifact proxy") public class SetuptoolsTest { private static final String[] SETUPTOOLS_VERSIONS_TO_TEST = new String[] { "74.0.0" }; private static final String PIP_VERSION = "24.2"; From 6eb108c8d981172aa367986fe932556bbd2905ec Mon Sep 17 00:00:00 2001 From: zahidblackduck Date: Mon, 27 Jul 2026 10:47:51 +0600 Subject: [PATCH 11/11] remove unused imports --- .../integration/detect/battery/docker/SetuptoolsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java index e0882dfc6a..646ba5d164 100644 --- a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java +++ b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java @@ -6,7 +6,6 @@ import java.util.Map; import java.util.stream.Stream; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource;