Skip to content
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.

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

chore: add tests before publishing a release and remove arm64 architecture #91

Merged
merged 35 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cfdc892
testing it out
ericwyles May 31, 2024
1f73098
testing it out
ericwyles May 31, 2024
1b7f43d
pre release testing
ericwyles Jun 3, 2024
40eb695
simplify
ericwyles Jun 3, 2024
d0af939
description
ericwyles Jun 3, 2024
a6db1b3
refactor
ericwyles Jun 4, 2024
eae0b6c
clean up includes
ericwyles Jun 4, 2024
bb50f67
clean up includes
ericwyles Jun 4, 2024
ce8d119
wip
ericwyles Jun 4, 2024
5a5c0d1
wip
ericwyles Jun 5, 2024
469d77d
wip
ericwyles Jun 5, 2024
95b6e1c
wip
ericwyles Jun 5, 2024
da56a86
missed a spot
ericwyles Jun 5, 2024
73b069c
lint
ericwyles Jun 5, 2024
9381629
trying to run something on arm without going through a full release
ericwyles Jun 5, 2024
9fca764
playing around
ericwyles Jun 5, 2024
382f7de
make it run
ericwyles Jun 5, 2024
534c769
arm64 test
ericwyles Jun 6, 2024
2c226df
try a uds cli arm install
ericwyles Jun 6, 2024
937c6c2
trying to install uds cli
ericwyles Jun 6, 2024
b6dfee3
try running some uds commands
ericwyles Jun 6, 2024
d7c25f3
try spinning up the cluster and app
ericwyles Jun 6, 2024
d5ee53e
try spinning up the cluster and app
ericwyles Jun 6, 2024
014a103
try just the cluster and doug
ericwyles Jun 6, 2024
37fed68
conditionals on runner arch
ericwyles Jun 6, 2024
edab9b1
move uds version to env var
ericwyles Jun 6, 2024
286eb25
move uds version to env var
ericwyles Jun 6, 2024
73749d8
use action from uds common again
ericwyles Jun 6, 2024
feb5884
try with new postgres operator version
ericwyles Jun 7, 2024
71c6435
updates
ericwyles Jun 11, 2024
442b997
don't need exclusion
ericwyles Jun 11, 2024
1208c3b
Merge branch 'main' into ewyles/pre-release-testing
ericwyles Jun 11, 2024
cd487cc
Merge branch 'main' into ewyles/pre-release-testing
ericwyles Jun 11, 2024
4d00ce9
Update .github/workflows/tag-and-release.yaml
ericwyles Jun 12, 2024
964d4cf
debug output
ericwyles Jun 12, 2024
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
13 changes: 9 additions & 4 deletions .github/workflows/tag-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ jobs:
publish-package:
needs: tag-new-version
if: ${{ needs.tag-new-version.outputs.release_created == 'true' }}
runs-on: ubuntu-latest
name: Publish ${{ matrix.flavor }}
runs-on: ${{ matrix.architecture == 'arm64' && 'uds-ubuntu-arm64-4-core' || 'ubuntu-latest' }}
strategy:
matrix:
flavor: [upstream, registry1]
architecture: [amd64]
name: Publish ${{ matrix.flavor }} ${{ matrix.architecture }}

permissions:
contents: read
Expand All @@ -46,10 +47,14 @@ jobs:
ghToken: ${{ secrets.GITHUB_TOKEN }}

- name: Publish Package
run: uds run -f tasks/publish.yaml package --set FLAVOR=${{ matrix.flavor }}
run: UDS_ARCHITECTURE=${{ matrix.architecture }} uds run -f tasks/publish.yaml package --set FLAVOR=${{ matrix.flavor }}
ericwyles marked this conversation as resolved.
Show resolved Hide resolved

- name: Debug Output
if: ${{ always() }}
uses: defenseunicorns/uds-common/.github/actions/debug-output@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0

- name: Save logs
if: always()
uses: defenseunicorns/uds-common/.github/actions/save-logs@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
with:
suffix: ${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}
suffix: ${{ matrix.flavor }}-${{ matrix.architecture }}-${{ github.run_id }}-${{ github.run_attempt }}
4 changes: 4 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ jobs:
flavor: ${{ matrix.flavor }}
type: ${{ matrix.type }}

- name: Debug Output
if: ${{ always() }}
uses: defenseunicorns/uds-common/.github/actions/debug-output@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0

- name: Save logs
if: always()
uses: defenseunicorns/uds-common/.github/actions/save-logs@4cea6c8858b9f4db3a3624a6fc046db77e1f4eaa # v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ packages:

- name: postgres-operator
repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator
ref: 1.11.0-uds.0-upstream
ref: 1.11.0-uds.1-upstream
overrides:
postgres-operator:
uds-postgres-config:
Expand Down
10 changes: 3 additions & 7 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ tasks:
# CI will execute the following (via uds-common/.github/actions/test) so they need to be here with these names

- name: test-package
description: Test the health of a Mattermost deployment
description: Test deploying the current branch to a new cluster
actions:
- task: create-mm-test-bundle
- task: setup:k3d-test-cluster
- task: deploy:test-bundle
- task: setup:create-doug-user
- task: test:health-check
- task: test:ingress
- task: test:ui
- task: test:all

- name: test-upgrade
description: Test an upgrade from the latest released package to the current branch
Expand All @@ -69,6 +67,4 @@ tasks:
- task: deploy:test-bundle
- cmd: ./uds zarf tools kubectl delete pods --all --namespace mattermost
description: "Workaround - restart the pods so the sso configuration will take effect"
- task: test:health-check
- task: test:ingress
- task: test:ui
- task: test:all
23 changes: 13 additions & 10 deletions tasks/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
includes:
- dependencies: ./dependencies.yaml
- test: ./test.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/create.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/deploy.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/publish.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.5.0/tasks/setup.yaml

tasks:
- name: package
description: Build and publish the packages
actions:
- description: Create the AMD64 package
task: create:package
with:
architecture: amd64

- description: Create the ARM64 package
task: create:package
with:
architecture: arm64
actions:
- task: create:package
- task: dependencies:create
- task: create:test-bundle
- task: setup:k3d-test-cluster
- task: deploy:test-bundle
- task: setup:create-doug-user
- task: test:all

- description: Publish the packages
- description: Publish the package
task: publish:package
with:
# x-release-please-start-version
Expand Down
6 changes: 6 additions & 0 deletions tasks/test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
tasks:
- name: all
actions:
- task: health-check
- task: ingress
- task: ui

- name: health-check
actions:
- description: Mattermost Health Check
Expand Down