Skip to content

CORE-609: update last step of nightly automation test to reflect CRDC offboarding #1659

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

Merged
merged 2 commits into from
Aug 18, 2025
Merged

CORE-609: update last step of nightly automation test to reflect CRDC offboarding #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54bcfa1
update last step of nightly automation test to reflect CRDC offboarding
davidangb Aug 18, 2025
f81a6f8
allow specifying test branch for manual automation runs
davidangb Aug 18, 2025
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
14 changes: 10 additions & 4 deletions .github/workflows/orch-nightly-swat-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ on:
schedule:
- cron: "30 9 * * *"
workflow_dispatch:
inputs:
test-code-ref:
description: "The branch, tag or SHA of test automation code to execute."
default: ''
required: false
type: string

env:
RUN_NAME: '${{ github.event.repository.name }}-${{ github.run_id }}-${{ github.run_attempt }}'
Expand Down Expand Up @@ -40,7 +46,7 @@ jobs:
matrix:
terra-env: [ dev ] # what versions of apps do we use to emulate types of environments
runs-on: ubuntu-latest
needs: [prepare-configs]
needs: [ prepare-configs ]
permissions:
contents: 'read'
id-token: 'write'
Expand Down Expand Up @@ -72,7 +78,7 @@ jobs:
terra-env: [ dev ] # what versions of apps do we use to emulate types of environments
testing-env: [ qa ] # what env resources to use, e.g. SA keys
runs-on: ubuntu-latest
needs: [prepare-configs, create-bee-workflow]
needs: [ prepare-configs, create-bee-workflow ]
permissions:
contents: 'read'
id-token: 'write'
Expand All @@ -89,7 +95,7 @@ jobs:
"bee-name": "orch-${{ github.run_id }}-${{ matrix.terra-env }}",
"ENV": "${{ matrix.testing-env }}",
"test-context": "${{ needs.prepare-configs.outputs.test-context }}",
"ref": "${{ needs.prepare-configs.outputs.tag }}"
"ref": "${{ inputs.test-code-ref || needs.prepare-configs.outputs.tag }}"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this allows specifying which branch of test code to run, instead of always using the latest tag.

}'
# github.head_ref, used above, is only populated for PRs and will be blank when merging to develop.
# This is ok; the orch-swat-tests workflow uses "develop" as a default when receiving a blank value.
Expand All @@ -99,7 +105,7 @@ jobs:
matrix:
terra-env: [ dev ] # what versions of apps do we use to emulate types of environments
runs-on: ubuntu-latest
needs: [orch-swat-test-job]
needs: [ orch-swat-test-job ]
if: always() # always run to confirm bee is destroyed
permissions:
contents: 'read'
Expand Down
4 changes: 3 additions & 1 deletion automation/src/test/scala/org/broadinstitute/dsde/test/api/orch/OrchestrationApiSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ class OrchestrationApiSpec extends AnyFreeSpec with Matchers with ScalaFutures w

Orchestration.NIH.syncWhitelistFull()

verifyDatasetPermissions(Set(NihDatasetPermission("TCGA", false), NihDatasetPermission("TARGET", false)))
verifyDatasetPermissions(
Set(NihDatasetPermission("GTEx", false), NihDatasetPermission("AnVIL_CARD_HBCC_GRU", false))
)
}

private def verifyDatasetPermissions(
Expand Down
Loading