From 80362699d3bb9e1da2c169df087d720b0046406e Mon Sep 17 00:00:00 2001 From: BryanFauble <17128019+BryanFauble@users.noreply.github.com> Date: Wed, 3 Sep 2025 16:50:22 +0000 Subject: [PATCH] Update Synapse login to specify profile in deletion scripts and integration test scripts --- .github/scripts/delete_evaluations.py | 2 +- .github/scripts/delete_projects.py | 2 +- .github/scripts/delete_teams.py | 2 +- .github/scripts/empty_trash.py | 2 +- .github/workflows/build.yml | 23 ++++++++++++++++++++++ .github/workflows/test-cleanup.yml | 27 ++++++++++++++++++++++++++ test.synapseConfig.enc | Bin 1120 -> 6240 bytes 7 files changed, 54 insertions(+), 4 deletions(-) diff --git a/.github/scripts/delete_evaluations.py b/.github/scripts/delete_evaluations.py index fb125f2a3..bd92edb1d 100644 --- a/.github/scripts/delete_evaluations.py +++ b/.github/scripts/delete_evaluations.py @@ -4,7 +4,7 @@ from synapseclient import Evaluation, Synapse syn = Synapse() -syn.login() +syn.login(profile=None) # Maximum number of concurrent deletion operations MAX_CONCURRENT_DELETIONS = 5 diff --git a/.github/scripts/delete_projects.py b/.github/scripts/delete_projects.py index 5eaa3e7dc..8f83e50d2 100644 --- a/.github/scripts/delete_projects.py +++ b/.github/scripts/delete_projects.py @@ -4,7 +4,7 @@ from synapseclient import Synapse syn = Synapse() -syn.login() +syn.login(profile=None) # Maximum number of concurrent deletion operations MAX_CONCURRENT_DELETIONS = 5 diff --git a/.github/scripts/delete_teams.py b/.github/scripts/delete_teams.py index 72ab0a45a..49d086372 100644 --- a/.github/scripts/delete_teams.py +++ b/.github/scripts/delete_teams.py @@ -4,7 +4,7 @@ from synapseclient import Synapse syn = Synapse() -syn.login() +syn.login(profile=None) # Maximum number of concurrent team deletions MAX_CONCURRENT_DELETIONS = 5 diff --git a/.github/scripts/empty_trash.py b/.github/scripts/empty_trash.py index 989e6ebe3..de4a24a89 100644 --- a/.github/scripts/empty_trash.py +++ b/.github/scripts/empty_trash.py @@ -4,7 +4,7 @@ from synapseclient import Synapse syn = Synapse() -syn.login() +syn.login(profile=None) # Maximum number of concurrent deletion operations MAX_CONCURRENT_DELETIONS = 5 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1371780e5..0cef50cbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,6 +135,29 @@ jobs: # keep versions consistent with the first and last from the strategy matrix if: ${{ (contains(fromJSON('["3.9"]'), matrix.python) || contains(fromJSON('["3.13"]'), matrix.python)) && steps.secret-check.outputs.secrets_available == 'true'}} run: | + # Set SYNAPSE_PROFILE based on OS and Python version + if [ "${{ startsWith(matrix.os, 'ubuntu') }}" == "true" ]; then + if [ "${{ matrix.python }}" == "3.9" ]; then + export SYNAPSE_PROFILE="TestUbuntuMinimumPython" + elif [ "${{ matrix.python }}" == "3.13" ]; then + export SYNAPSE_PROFILE="TestUbuntuMaximumPython" + fi + elif [ "${{ startsWith(matrix.os, 'windows') }}" == "true" ]; then + if [ "${{ matrix.python }}" == "3.9" ]; then + export SYNAPSE_PROFILE="TestWindowsMinimumPython" + elif [ "${{ matrix.python }}" == "3.13" ]; then + export SYNAPSE_PROFILE="TestWindowsMaximumPython" + fi + elif [ "${{ startsWith(matrix.os, 'macos') }}" == "true" ]; then + if [ "${{ matrix.python }}" == "3.9" ]; then + export SYNAPSE_PROFILE="TestMacosMinimumPython" + elif [ "${{ matrix.python }}" == "3.13" ]; then + export SYNAPSE_PROFILE="TestMacosMaximumPython" + fi + fi + + echo "Using SYNAPSE_PROFILE: $SYNAPSE_PROFILE" + # decrypt the encrypted test synapse configuration openssl aes-256-cbc -K ${{ secrets.encrypted_d17283647768_key }} -iv ${{ secrets.encrypted_d17283647768_iv }} -in test.synapseConfig.enc -out test.synapseConfig -d mv test.synapseConfig ~/.synapseConfig diff --git a/.github/workflows/test-cleanup.yml b/.github/workflows/test-cleanup.yml index 03a465fe2..a718eaa41 100644 --- a/.github/workflows/test-cleanup.yml +++ b/.github/workflows/test-cleanup.yml @@ -13,6 +13,17 @@ jobs: permissions: contents: read + strategy: + matrix: + synapse_profile: + - "TestUbuntuMinimumPython" + - "TestUbuntuMaximumPython" + - "TestWindowsMinimumPython" + - "TestWindowsMaximumPython" + - "TestMacosMinimumPython" + - "TestMacosMaximumPython" + - "" # Empty string for default profile (no SYNAPSE_PROFILE set) + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -67,17 +78,33 @@ jobs: mv test.synapseConfig ~/.synapseConfig - name: Run evaluation deletion script + shell: bash run: | + if [ -n "${{ matrix.synapse_profile }}" ]; then + export SYNAPSE_PROFILE="${{ matrix.synapse_profile }}" + fi python .github/scripts/delete_evaluations.py - name: Run project deletion script + shell: bash run: | + if [ -n "${{ matrix.synapse_profile }}" ]; then + export SYNAPSE_PROFILE="${{ matrix.synapse_profile }}" + fi python .github/scripts/delete_projects.py - name: Run team deletion script + shell: bash run: | + if [ -n "${{ matrix.synapse_profile }}" ]; then + export SYNAPSE_PROFILE="${{ matrix.synapse_profile }}" + fi python .github/scripts/delete_teams.py - name: Run empty trash script + shell: bash run: | + if [ -n "${{ matrix.synapse_profile }}" ]; then + export SYNAPSE_PROFILE="${{ matrix.synapse_profile }}" + fi python .github/scripts/empty_trash.py diff --git a/test.synapseConfig.enc b/test.synapseConfig.enc index 9609e72505d924a700cb9f07e44020298e80c486..79d5f16c11f167bdfae507af5e52c21a7950ae09 100644 GIT binary patch literal 6240 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