add support for overriding METplotpy, METcalcpy, and METdataio branch…

… for testing workflow
dtcenter · Feb 12, 2025 · a5797cc · a5797cc
1 parent a700167
commit a5797cc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
@@ -6,9 +6,24 @@ inputs:
   categories:
     description: 'Use case category or categories to run (separate by comma)'
     required: true
+  metplotpy_branch:
+    description: 'Branch to use for METplotpy (default is determined by METplus version)'
+    required: false
+    default: ''
+  metcalcpy_branch:
+    description: 'Branch to use for METcalcpy (default is determined by METplus version)'
+    required: false
+    default: ''
+  metdataio_branch:
+    description: 'Branch to use for METdataio (default is determined by METplus version)'
+    required: false
+    default: ''
 
 runs:
   using: "docker"
   image: "Dockerfile"
   args:
     - ${{ inputs.categories }}
+    - ${{ inputs.metplotpy_branch }}
+    - ${{ inputs.metcalcpy_branch }}
+    - ${{ inputs.metdataio_branch }}
diff --git a/.github/jobs/get_use_case_commands.py b/.github/jobs/get_use_case_commands.py
@@ -95,11 +95,14 @@ def handle_automation_env(host_name, reqs):
 
     setup_env.append(f'cd {METPLUS_DOCKER_LOC}/..')
     for component in components:
-        version = get_component_version(input_component='METplus',
-                                        input_version=metplus_version,
-                                        output_component=component,
-                                        output_format='main_v{X}.{Y}',
-                                        get_dev=False)
+        # get branch if defined, otherwise determine from METplus version
+        version = os.environ.get(f'INPUT_{component.upper()}_BRANCH')
+        if not version:
+            version = get_component_version(input_component='METplus',
+                                            input_version=metplus_version,
+                                            output_component=component,
+                                            output_format='main_v{X}.{Y}',
+                                            get_dev=False)
         setup_env.extend((
             'git --version',
             f'git clone --single-branch --branch {version} https://github.com/dtcenter/{component}',

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -46,6 +46,12 @@ on:
         description: 'User that triggered the event (used by external repo triggering)'
       pusher_email:
         description: 'Email address of user who triggered push event (used by external repo triggering)'
+      metplotpy_branch:
+        description: 'METplotpy branch to use (default is develop or main_vX.Y)'
+      metcalcpy_branch:
+        description: 'METcalcpy branch to use (default is develop or main_vX.Y)'
+      metdataio_branch:
+        description: 'METdataio branch to use (default is develop or main_vX.Y)'
 
 jobs:
 
@@ -190,6 +196,9 @@ jobs:
         id: run_tests
         with:
           categories: ${{ matrix.categories }}
+          metplotpy_branch: ${{ github.event.inputs.metplotpy_branch }}
+          metcalcpy_branch: ${{ github.event.inputs.metcalcpy_branch }}
+          metdataio_branch: ${{ github.event.inputs.metdataio_branch }}
 
       # copy logs with errors to error_logs directory to save as artifact
       - name: Save error logs