Skip to content

Fix DE functional test workflow to be consistent with publish workflow #10963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
willdavsmith wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix DE functional test workflow to be consistent with publish workflow #10963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/actions/copy-deployment-engine-image/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ runs:
env:
SRC_IMAGE: ${{ inputs.src_image }}
run: |
# Example: SRC_REGISTRY_NAME=myregistry
# Example:
# SRC_IMAGE=radiusdeploymentengine.azurecr.io/deployment-engine
# SRC_REGISTRY_NAME=radiusdeploymentengine
SRC_REGISTRY_NAME=$(echo "${SRC_IMAGE}" | cut -d'.' -f1)
az acr login --name "${SRC_REGISTRY_NAME}"

Expand Down
21 changes: 6 additions & 15 deletions .github/workflows/functional-test-cloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ on:
# Dispatch on external events
repository_dispatch:
types: [deployment-engine.run-functional-tests]
# Expected client_payload:
# src_image: Source image in ACR (e.g. radiusdeploymentengine.azurecr.io/deployment-engine)
# dest_image: Destination image in GHCR (e.g. ghcr.io/radius-project/deployment-engine)
# tag: Tag for the image (e.g. latest, 0.1, 0.1.0-rc1, pr-123)
workflow_run:
workflows: [Approve Functional Tests]
types:
Expand Down Expand Up @@ -241,11 +245,11 @@ jobs:
if: github.event_name == 'repository_dispatch'
shell: bash
env:
IMAGE_NAME: ${{ github.event.client_payload.image_name }}
DEST_IMAGE: ${{ github.event.client_payload.dest_image }}
TAG: ${{ github.event.client_payload.tag }}
run: |
{
echo "DE_IMAGE=${IMAGE_NAME}"
echo "DE_IMAGE=${DEST_IMAGE}"
echo "DE_TAG=${TAG}"
} >> "$GITHUB_ENV"

Expand Down Expand Up @@ -324,19 +328,6 @@ jobs:
submodules: recursive
persist-credentials: false

- name: Copy Deployment Engine image to GHCR
if: github.event_name == 'repository_dispatch'
uses: ./.github/actions/copy-deployment-engine-image
env:
GHCR_PASSWORD: ${{ secrets.GH_RAD_CI_BOT_PAT }}
DE_CONTAINER_AZURE_CLIENT_ID: ${{ secrets.DE_CONTAINER_AZURE_CLIENT_ID }}
DE_CONTAINER_AZURE_TENANT_ID: ${{ secrets.DE_CONTAINER_AZURE_TENANT_ID }}
DE_CONTAINER_AZURE_SUBSCRIPTION_ID: ${{ secrets.DE_CONTAINER_AZURE_SUBSCRIPTION_ID }}
with:
tag: ${{ env.DE_TAG }}
src_image: ${{ env.DE_IMAGE }}
dest_image: ghcr.io/radius-project/deployment-engine

- name: Checkout
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with:
Expand Down
35 changes: 13 additions & 22 deletions .github/workflows/functional-test-noncloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ on:
# Dispatch on external events
repository_dispatch:
types: [deployment-engine.run-functional-tests]
# Expected client_payload:
# src_image: Source image in ACR (e.g. radiusdeploymentengine.azurecr.io/deployment-engine)
# dest_image: Destination image in GHCR (e.g. ghcr.io/radius-project/deployment-engine)
# tag: Tag for the image (e.g. latest, 0.1, 0.1.0-rc1, pr-123)
pull_request:
branches:
- main
Expand Down Expand Up @@ -111,37 +115,24 @@ jobs:
DE_IMAGE: ${{ steps.gen-id.outputs.DE_IMAGE }}
DE_TAG: ${{ steps.gen-id.outputs.DE_TAG }}
steps:
- name: Set DE image and tag (repository_dispatch from deployment-engine.run-functional-tests)
if: github.event_name == 'repository_dispatch'
shell: bash
env:
IMAGE_NAME: ${{ github.event.client_payload.image_name }}
TAG: ${{ github.event.client_payload.tag }}
run: |
{
echo "DE_IMAGE=${IMAGE_NAME}"
echo "DE_TAG=${TAG}"
} >> "$GITHUB_ENV"

- name: Checkout
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
persist-credentials: false

- name: Copy Deployment Engine image to GHCR
- name: Set DE image and tag (repository_dispatch from deployment-engine.run-functional-tests)
if: github.event_name == 'repository_dispatch'
uses: ./.github/actions/copy-deployment-engine-image
shell: bash
env:
GHCR_PASSWORD: ${{ secrets.GH_RAD_CI_BOT_PAT }}
DE_CONTAINER_AZURE_CLIENT_ID: ${{ secrets.DE_CONTAINER_AZURE_CLIENT_ID }}
DE_CONTAINER_AZURE_TENANT_ID: ${{ secrets.DE_CONTAINER_AZURE_TENANT_ID }}
DE_CONTAINER_AZURE_SUBSCRIPTION_ID: ${{ secrets.DE_CONTAINER_AZURE_SUBSCRIPTION_ID }}
with:
tag: ${{ env.DE_TAG }}
src_image: ${{ env.DE_IMAGE }}
dest_image: ghcr.io/radius-project/deployment-engine
DEST_IMAGE: ${{ github.event.client_payload.dest_image }}
TAG: ${{ github.event.client_payload.tag }}
Comment on lines +129 to +130
Copy link

Copilot AI Dec 17, 2025

Choose a reason for hiding this comment

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

The workflow documentation indicates that src_image is part of the expected client_payload (line 36), but this field is not being consumed anywhere in the workflow after the image copying step was removed. Consider removing src_image from the documentation comment if it's no longer needed, or add validation to ensure the payload structure is as expected.

Copilot uses AI. Check for mistakes.
run: |
{
echo "DE_IMAGE=${DEST_IMAGE}"
echo "DE_TAG=${TAG}"
} >> "$GITHUB_ENV"

- name: Generate ID for release
id: gen-id
Expand Down
Loading