Skip to content

Segregate Docker-dependent tests to GitHub Actions workflow#49481

Open
rujche wants to merge 2 commits into
mainfrom
rujche/main/update-pipeline-to-fit-network-change-for-docker-related-test
Open

Segregate Docker-dependent tests to GitHub Actions workflow#49481
rujche wants to merge 2 commits into
mainfrom
rujche/main/update-pipeline-to-fit-network-change-for-docker-related-test

Conversation

@rujche

@rujche rujche commented Jun 12, 2026

Copy link
Copy Markdown
Member

Description

Problem

Azure DevOps network policies block Microsoft Container Registry (MCR) image pulls, causing Docker-dependent tests to fail in the default CI pipeline.

Solution

  • Tag Docker-dependent tests with @tag("docker") in JUnit 5
  • Configure Maven surefire to exclude docker-tagged tests from default CI
  • Create dedicated GitHub Actions workflow on ubuntu-24.04 with Docker support
  • Use docker-tests Maven profile to selectively run only tagged tests in GitHub Actions

Changes

  1. Add @tag("docker") to 9 Docker-dependent test classes:

    • 5 in spring-cloud-azure-testcontainers module
    • 4 in spring-cloud-azure-docker-compose module
  2. Update pom.xml in both modules:

    • Configure surefire excludedGroups for docker tag
    • Add docker-tests Maven profile to override exclusion
  3. Create .github/workflows/spring-docker-tests.yml:

    • Runs on ubuntu-24.04 with Docker pre-installed
    • Triggered by changes to spring modules and workflow file
    • Two-phase build: install deps, then run docker-tests profile
    • Triggered by pull_request and workflow_dispatch events

Impact

  • Docker tests no longer block PR merges in ADO
  • Docker tests run independently in GitHub Actions on Linux
  • Default local Maven build excludes docker tests
  • Developers can opt-in with: mvn test -Pdocker-tests

All SDK Contribution checklist:

  • The pull request does not introduce [breaking changes]
  • CHANGELOG is updated for new features, bug fixes or other significant changes.
  • I have read the contribution guidelines.

General Guidelines and Best Practices

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

Copilot AI review requested due to automatic review settings June 12, 2026 01:38
@rujche rujche requested review from a team, Netyyyy, moarychan and saragluna as code owners June 12, 2026 01:38
@rujche rujche self-assigned this Jun 12, 2026
@rujche rujche added the azure-spring All azure-spring related issues label Jun 12, 2026
@rujche rujche moved this from Todo to In Progress in Spring Cloud Azure Jun 12, 2026
@rujche rujche added this to the 2026-07 milestone Jun 12, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR aims to prevent Docker/image-pull constraints in Azure DevOps CI (MCR blocked) from breaking Spring module test runs by tagging Docker-dependent tests and moving their execution to a dedicated GitHub Actions workflow that runs on a Docker-capable runner.

Changes:

  • Tagged Docker-dependent JUnit 5 test classes with @Tag("docker") in the Spring test modules.
  • Updated module POMs to exclude docker-tagged tests by default and add a docker-tests Maven profile to run only those tests when desired.
  • Added a GitHub Actions workflow to build the Spring modules and execute the docker-tagged tests on ubuntu-24.04.

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
sdk/spring/spring-cloud-azure-testcontainers/src/test/java/com/azure/spring/cloud/testcontainers/implementation/service/connection/storage/StorageQueueContainerConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Testcontainers-based queue test for Docker-only runs.
sdk/spring/spring-cloud-azure-testcontainers/src/test/java/com/azure/spring/cloud/testcontainers/implementation/service/connection/storage/StorageBlobContainerConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Testcontainers-based blob test for Docker-only runs.
sdk/spring/spring-cloud-azure-testcontainers/src/test/java/com/azure/spring/cloud/testcontainers/implementation/service/connection/hubs/EventHubsContainerConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Event Hubs emulator Testcontainers test for Docker-only runs.
sdk/spring/spring-cloud-azure-testcontainers/src/test/java/com/azure/spring/cloud/testcontainers/implementation/service/connection/cosmos/CosmosContainerConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Cosmos emulator Testcontainers test for Docker-only runs.
sdk/spring/spring-cloud-azure-testcontainers/src/test/java/com/azure/spring/cloud/testcontainers/implementation/service/connection/bus/ServiceBusContainerConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Service Bus emulator Testcontainers test for Docker-only runs.
sdk/spring/spring-cloud-azure-testcontainers/pom.xml Configures Surefire to exclude docker-tagged tests by default and introduces docker-tests profile to include them.
sdk/spring/spring-cloud-azure-docker-compose/src/test/java/com/azure/spring/cloud/docker/compose/implementation/service/connection/storage/StorageQueueDockerComposeConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Docker Compose-based queue test for Docker-only runs.
sdk/spring/spring-cloud-azure-docker-compose/src/test/java/com/azure/spring/cloud/docker/compose/implementation/service/connection/storage/StorageBlobDockerComposeConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Docker Compose-based blob test for Docker-only runs.
sdk/spring/spring-cloud-azure-docker-compose/src/test/java/com/azure/spring/cloud/docker/compose/implementation/service/connection/hubs/EventHubsDockerComposeConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Docker Compose-based Event Hubs test for Docker-only runs.
sdk/spring/spring-cloud-azure-docker-compose/src/test/java/com/azure/spring/cloud/docker/compose/implementation/service/connection/bus/ServiceBusDockerComposeConnectionDetailsFactoryTests.java Adds @Tag("docker") to mark Docker Compose-based Service Bus test for Docker-only runs.
sdk/spring/spring-cloud-azure-docker-compose/pom.xml Configures Surefire to exclude docker-tagged tests by default and introduces docker-tests profile to include them.
.github/workflows/spring-docker-tests.yml Adds a GitHub Actions workflow to run docker-tagged Spring tests on Ubuntu with Docker available.

Comment thread sdk/spring/spring-cloud-azure-testcontainers/pom.xml
Comment thread sdk/spring/spring-cloud-azure-docker-compose/pom.xml
## Problem
Azure DevOps network policies block Microsoft Container Registry (MCR) image pulls,
causing Docker-dependent tests to fail in the default CI pipeline.

## Solution
- Tag Docker-dependent tests with @tag("docker") in JUnit 5
- Configure Maven surefire to exclude docker-tagged tests from default CI
- Create dedicated GitHub Actions workflow on ubuntu-24.04 with Docker support
- Use docker-tests Maven profile to selectively run only tagged tests in GitHub Actions

## Changes
1. Add @tag("docker") to 9 Docker-dependent test classes:
   - 5 in spring-cloud-azure-testcontainers module
   - 4 in spring-cloud-azure-docker-compose module

2. Update pom.xml in both modules:
   - Configure surefire excludedGroups for docker tag
   - Add docker-tests Maven profile to override exclusion

3. Create .github/workflows/spring-docker-tests.yml:
   - Runs on ubuntu-24.04 with Docker pre-installed
   - Triggered by changes to spring modules and workflow file
   - Two-phase build: install deps, then run docker-tests profile
   - Triggered by pull_request and workflow_dispatch events

## Impact
- Docker tests no longer block PR merges in ADO
- Docker tests run independently in GitHub Actions on Linux
- Default local Maven build excludes docker tests
- Developers can opt-in with: mvn test -Pdocker-tests
@rujche rujche force-pushed the rujche/main/update-pipeline-to-fit-network-change-for-docker-related-test branch from c482169 to 500493f Compare June 12, 2026 01:54
@rujche rujche requested a review from Copilot June 12, 2026 01:55

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 2 comments.

Comment thread sdk/spring/spring-cloud-azure-testcontainers/pom.xml
Comment thread sdk/spring/spring-cloud-azure-docker-compose/pom.xml

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated no new comments.

@@ -0,0 +1,54 @@
name: Spring Docker Tests

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this workflow be required check for pull requests?

@raych1 raych1 requested a review from mikeharder June 13, 2026 00:44
@raych1

raych1 commented Jun 13, 2026

Copy link
Copy Markdown
Member

@mikeharder could you review this PR? This is a workflow to run spring service tests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

azure-spring All azure-spring related issues

Projects

Status: In Progress

Development

Successfully merging this pull request may close these issues.

3 participants