From f9fbc3d797121e010ac9bcfddd15c81d702b7f8a Mon Sep 17 00:00:00 2001 From: codyshoffner Date: Mon, 1 Jun 2026 09:31:06 -0500 Subject: [PATCH 1/5] ci: add verify skip workflow --- .../container-and-chart/helm/chart/Chart.yaml | 2 +- .github/workflows/test.yaml | 120 +++++++++--------- .github/workflows/verify-skip.yaml | 16 +++ 3 files changed, 77 insertions(+), 61 deletions(-) create mode 100644 .github/workflows/verify-skip.yaml diff --git a/.github/container-and-chart/helm/chart/Chart.yaml b/.github/container-and-chart/helm/chart/Chart.yaml index b846145..9cb0eab 100644 --- a/.github/container-and-chart/helm/chart/Chart.yaml +++ b/.github/container-and-chart/helm/chart/Chart.yaml @@ -23,5 +23,5 @@ version: 0.1.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. +# It is recommended to use it with quotes.. appVersion: "0.1.1" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2ff312b..bf40429 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,70 +1,70 @@ -# Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial +# # Copyright 2024 Defense Unicorns +# # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial -name: Test +# name: Test -on: - # This workflow is triggered on pull requests to the main branch. - pull_request: - # milestoned is added here so that a PR can be re-triggered if it is milestoned. - types: [milestoned, opened, reopened, synchronize] - paths-ignore: - - ".github/container-and-chart/**" +# on: +# # This workflow is triggered on pull requests to the main branch. +# pull_request: +# # milestoned is added here so that a PR can be re-triggered if it is milestoned. +# types: [milestoned, opened, reopened, synchronize] +# paths-ignore: +# - ".github/container-and-chart/**" -# Permissions for the GITHUB_TOKEN used by the workflow. -permissions: - contents: read # Allows reading the content of the repository. - packages: read # Allows reading the content of the repository's packages. - pull-requests: read - id-token: write +# # Permissions for the GITHUB_TOKEN used by the workflow. +# permissions: +# contents: read # Allows reading the content of the repository. +# packages: read # Allows reading the content of the repository's packages. +# pull-requests: read +# id-token: write -# Abort prior jobs in the same workflow / PR -concurrency: - group: test-${{ github.ref }} - cancel-in-progress: true +# # Abort prior jobs in the same workflow / PR +# concurrency: +# group: test-${{ github.ref }} +# cancel-in-progress: true -jobs: - check-flavor: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 +# jobs: +# check-flavor: +# runs-on: ubuntu-latest +# steps: +# - name: Checkout repository +# uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - name: test-flavor - uses: defenseunicorns/uds-common/.github/actions/test-flavor@ba03e5bec6704a54466a94a3fdee9741b755630b # v1.24.11 - id: test-flavor - outputs: - upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }} +# - name: test-flavor +# uses: defenseunicorns/uds-common/.github/actions/test-flavor@ba03e5bec6704a54466a94a3fdee9741b755630b # v1.24.11 +# id: test-flavor +# outputs: +# upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }} - validate: - needs: check-flavor - strategy: - fail-fast: false - matrix: - type: [install, upgrade] - flavor: [upstream, unicorn] - uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@ba03e5bec6704a54466a94a3fdee9741b755630b # v1.24.11 - with: - timeout: 30 - options: --set BASE_REPO="ghcr.io/uds-packages" - runsOn: appstore-4-core-amd64 - upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }} - flavor: ${{ matrix.flavor }} - type: ${{ matrix.type }} - secrets: inherit # Inherits all secrets from the parent workflow. +# validate: +# needs: check-flavor +# strategy: +# fail-fast: false +# matrix: +# type: [install, upgrade] +# flavor: [upstream, unicorn] +# uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@ba03e5bec6704a54466a94a3fdee9741b755630b # v1.24.11 +# with: +# timeout: 30 +# options: --set BASE_REPO="ghcr.io/uds-packages" +# runsOn: appstore-4-core-amd64 +# upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }} +# flavor: ${{ matrix.flavor }} +# type: ${{ matrix.type }} +# secrets: inherit # Inherits all secrets from the parent workflow. - verify-test: - runs-on: ubuntu-latest - needs: validate - if: always() - steps: - - name: Check validate result - run: | - echo "validate result: ${{ needs.validate.result }}" +# verify-test: +# runs-on: ubuntu-latest +# needs: validate +# if: always() +# steps: +# - name: Check validate result +# run: | +# echo "validate result: ${{ needs.validate.result }}" - if [ "${{ needs.validate.result }}" != "success" ]; then - echo "One or more tests failed." - exit 1 - fi +# if [ "${{ needs.validate.result }}" != "success" ]; then +# echo "One or more tests failed." +# exit 1 +# fi - echo "All tests passed successfully!" +# echo "All tests passed successfully!" diff --git a/.github/workflows/verify-skip.yaml b/.github/workflows/verify-skip.yaml new file mode 100644 index 0000000..155c4c6 --- /dev/null +++ b/.github/workflows/verify-skip.yaml @@ -0,0 +1,16 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + +name: Test + +on: + pull_request: + types: [milestoned, opened, reopened, synchronize] + paths: + - ".github/container-and-chart/**" + +jobs: + verify-test: + runs-on: ubuntu-latest + steps: + - run: echo "No UDS package changes — skipping full test suite." From 475339a96765509379111f58d7f5529a7b3e5af7 Mon Sep 17 00:00:00 2001 From: codyshoffner Date: Mon, 1 Jun 2026 09:33:02 -0500 Subject: [PATCH 2/5] ci: add test back in --- .github/workflows/test.yaml | 120 ++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bf40429..2ff312b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,70 +1,70 @@ -# # Copyright 2024 Defense Unicorns -# # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial -# name: Test +name: Test -# on: -# # This workflow is triggered on pull requests to the main branch. -# pull_request: -# # milestoned is added here so that a PR can be re-triggered if it is milestoned. -# types: [milestoned, opened, reopened, synchronize] -# paths-ignore: -# - ".github/container-and-chart/**" +on: + # This workflow is triggered on pull requests to the main branch. + pull_request: + # milestoned is added here so that a PR can be re-triggered if it is milestoned. + types: [milestoned, opened, reopened, synchronize] + paths-ignore: + - ".github/container-and-chart/**" -# # Permissions for the GITHUB_TOKEN used by the workflow. -# permissions: -# contents: read # Allows reading the content of the repository. -# packages: read # Allows reading the content of the repository's packages. -# pull-requests: read -# id-token: write +# Permissions for the GITHUB_TOKEN used by the workflow. +permissions: + contents: read # Allows reading the content of the repository. + packages: read # Allows reading the content of the repository's packages. + pull-requests: read + id-token: write -# # Abort prior jobs in the same workflow / PR -# concurrency: -# group: test-${{ github.ref }} -# cancel-in-progress: true +# Abort prior jobs in the same workflow / PR +concurrency: + group: test-${{ github.ref }} + cancel-in-progress: true -# jobs: -# check-flavor: -# runs-on: ubuntu-latest -# steps: -# - name: Checkout repository -# uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 +jobs: + check-flavor: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 -# - name: test-flavor -# uses: defenseunicorns/uds-common/.github/actions/test-flavor@ba03e5bec6704a54466a94a3fdee9741b755630b # v1.24.11 -# id: test-flavor -# outputs: -# upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }} + - name: test-flavor + uses: defenseunicorns/uds-common/.github/actions/test-flavor@ba03e5bec6704a54466a94a3fdee9741b755630b # v1.24.11 + id: test-flavor + outputs: + upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }} -# validate: -# needs: check-flavor -# strategy: -# fail-fast: false -# matrix: -# type: [install, upgrade] -# flavor: [upstream, unicorn] -# uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@ba03e5bec6704a54466a94a3fdee9741b755630b # v1.24.11 -# with: -# timeout: 30 -# options: --set BASE_REPO="ghcr.io/uds-packages" -# runsOn: appstore-4-core-amd64 -# upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }} -# flavor: ${{ matrix.flavor }} -# type: ${{ matrix.type }} -# secrets: inherit # Inherits all secrets from the parent workflow. + validate: + needs: check-flavor + strategy: + fail-fast: false + matrix: + type: [install, upgrade] + flavor: [upstream, unicorn] + uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@ba03e5bec6704a54466a94a3fdee9741b755630b # v1.24.11 + with: + timeout: 30 + options: --set BASE_REPO="ghcr.io/uds-packages" + runsOn: appstore-4-core-amd64 + upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }} + flavor: ${{ matrix.flavor }} + type: ${{ matrix.type }} + secrets: inherit # Inherits all secrets from the parent workflow. -# verify-test: -# runs-on: ubuntu-latest -# needs: validate -# if: always() -# steps: -# - name: Check validate result -# run: | -# echo "validate result: ${{ needs.validate.result }}" + verify-test: + runs-on: ubuntu-latest + needs: validate + if: always() + steps: + - name: Check validate result + run: | + echo "validate result: ${{ needs.validate.result }}" -# if [ "${{ needs.validate.result }}" != "success" ]; then -# echo "One or more tests failed." -# exit 1 -# fi + if [ "${{ needs.validate.result }}" != "success" ]; then + echo "One or more tests failed." + exit 1 + fi -# echo "All tests passed successfully!" + echo "All tests passed successfully!" From 6d86a3f19bf5420a34f0929472b23b8e793cd203 Mon Sep 17 00:00:00 2001 From: codyshoffner Date: Mon, 1 Jun 2026 09:36:13 -0500 Subject: [PATCH 3/5] chore: description --- .github/workflows/verify-skip.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/verify-skip.yaml b/.github/workflows/verify-skip.yaml index 155c4c6..d8bc9c5 100644 --- a/.github/workflows/verify-skip.yaml +++ b/.github/workflows/verify-skip.yaml @@ -1,6 +1,9 @@ -# Copyright 2024 Defense Unicorns +# Copyright 2024-2026 Defense Unicorns # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial +# Pass-through for the required "verify-test" status check on PRs that update +# container images and charts. + name: Test on: From 6c64d1301e4a3415a6eccbf09401da230dabb565 Mon Sep 17 00:00:00 2001 From: codyshoffner Date: Mon, 1 Jun 2026 10:43:50 -0500 Subject: [PATCH 4/5] chore: remove . --- .github/container-and-chart/helm/chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/container-and-chart/helm/chart/Chart.yaml b/.github/container-and-chart/helm/chart/Chart.yaml index 9cb0eab..b846145 100644 --- a/.github/container-and-chart/helm/chart/Chart.yaml +++ b/.github/container-and-chart/helm/chart/Chart.yaml @@ -23,5 +23,5 @@ version: 0.1.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes.. +# It is recommended to use it with quotes. appVersion: "0.1.1" From 329fe65ef94956f8edd1039f7095d08c73515843 Mon Sep 17 00:00:00 2001 From: codyshoffner Date: Mon, 1 Jun 2026 10:59:17 -0500 Subject: [PATCH 5/5] chore: testing --- .github/container-and-chart/helm/chart/Chart.yaml | 2 +- tasks/test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/container-and-chart/helm/chart/Chart.yaml b/.github/container-and-chart/helm/chart/Chart.yaml index b846145..9cb0eab 100644 --- a/.github/container-and-chart/helm/chart/Chart.yaml +++ b/.github/container-and-chart/helm/chart/Chart.yaml @@ -23,5 +23,5 @@ version: 0.1.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. +# It is recommended to use it with quotes.. appVersion: "0.1.1" diff --git a/tasks/test.yaml b/tasks/test.yaml index b631a57..a092638 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -24,7 +24,7 @@ tasks: - description: Reference Package UI Status Check maxRetries: 30 cmd: | - STATUS=$(curl -L -o /dev/null -s -w "%{http_code}\n" https://reference-package.uds.dev) + STATUS=$(curl -L -o /dev/null -s -w "%{http_code}\n" https://blah.uds.dev) echo "Reference Package system status: ${STATUS}" if [ "$STATUS" != "200" ]; then sleep 10