Merge branch 'develop' into feature/test-flags-big-fix

Author: eap

README.md

@@ -69,11 +69,7 @@ jobs:
           aws-region: us-east-2
 
       - name: Run JEDI CI
-        uses: JCSDA-internal/jedi-ci@feature/ci-v3
+        uses: JCSDA-internal/jedi-ci@develop
         with:
           container_version: 'latest'
-        env:
-          TARGET_REPO_DIR: target_repository
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          JEDI_CI_TOKEN: ${{ steps.generate-token.outputs.token }}
-```
+          jedi_ci_token: ${{ steps.generate-token.outputs.token }}

action.yml

@@ -20,7 +20,7 @@ inputs:
     required: false
     default: 'run_tests.sh'
   target_repo_dir:
-    description: 'Target repository directory'
+    description: 'Deprecated option, we no longer pre-clone the target repository.'
     required: false
     default: 'target_repository'
   bundle_repository:
@@ -68,7 +68,6 @@ runs:
     TARGET_PROJECT_NAME: ${{ inputs.target_project_name }}
     BUNDLE_BRANCH: ${{ inputs.bundle_branch }}
     TEST_SCRIPT: ${{ inputs.test_script }}
-    TARGET_REPO_DIR: ${{ inputs.target_repo_dir }}
     BUNDLE_REPOSITORY: ${{ inputs.bundle_repository }}
     CI_SELF_TEST: ${{ inputs.self_test }}
     JEDI_CI_TOKEN: ${{ inputs.jedi_ci_token }}

ci_action/implementation.py

@@ -51,11 +51,48 @@ def upload_to_aws(bucket_name, s3_client, tarball_path, s3_file):
     return s3_path
 
 
+def cancel_prior_jobs_and_check_runs(
+    non_blocking_errors,
+    infra_config,
+    config,
+):
+    """Cancel prior unfinished jobs and check runs for the PR."""
+    # Use a thread pool to cancel prior unfinished jobs and their associated check runs.
+    # This process is done in parallel to save time on slow network-bound operations.
+    with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
+
+        # Submit operation: cancel prior unfinished AWS Batch jobs for the PR.
+        cxl_batch_future = executor.submit(
+            aws_client.cancel_prior_batch_jobs,
+            job_queue=infra_config['batch_queue'],
+            repo_name=config['repo_name'],
+            pr=config["pull_request_number"],
+        )
+
+        # Submit operation: cancel unfinished check runs for the PR.
+        cxl_checkrun_future = executor.submit(
+            github_client.cancel_prior_unfinished_check_runs,
+            repo=config['repo_name'],
+            owner=config['owner'],
+            pr_number=config["pull_request_number"],
+        )
+
+        # Wait for the cancel operations to complete.
+        for future in concurrent.futures.as_completed([cxl_batch_future, cxl_checkrun_future]):
+            try:
+                future.result()
+            except Exception as e:
+                if future is cxl_batch_future:
+                    non_blocking_errors.append(f"Error cancelling prior batch jobs: {e}")
+                else:
+                    non_blocking_errors.append(f"Error cancelling prior check runs: {e}")
+    return non_blocking_errors
+
+
 def prepare_and_launch_ci_test(
     infra_config,
     config,
     bundle_repo_path,
-    target_repo_path,
 ):
     """The main function that will be called to prepare and launch the CI test.
 
@@ -68,7 +105,6 @@ def prepare_and_launch_ci_test(
         config: The GitHub action environment configuration including
                 PR metadata and passed config variables.
         bundle_repo_path: The path to the bundle repository.
-        target_repo_path: The path to the target repository.
 
     Returns:
         A 2-tuple of lists of strings representing errors:
@@ -205,35 +241,11 @@ def prepare_and_launch_ci_test(
     else:
         chosen_build_environments = [test_select]
 
-    # Use a thread pool to cancel prior unfinished jobs and their associated check runs.
-    # This process is done in parallel to save time on slow network-bound operations.
-    with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
-
-        # Submit operation: cancel prior unfinished AWS Batch jobs for the PR.
-        cxl_batch_future = executor.submit(
-            aws_client.cancel_prior_batch_jobs,
-            job_queue=infra_config['batch_queue'],
-            repo_name=config['repo_name'],
-            pr=config["pull_request_number"],
-        )
-
-        # Submit operation: cancel unfinished check runs for the PR.
-        cxl_checkrun_future = executor.submit(
-            github_client.cancel_prior_unfinished_check_runs,
-            repo=config['repo_name'],
-            owner=config['owner'],
-            pr_number=config["pull_request_number"],
-        )
-
-        # Wait for the cancel operations to complete.
-        for future in concurrent.futures.as_completed([cxl_batch_future, cxl_checkrun_future]):
-            try:
-                future.result()
-            except Exception as e:
-                if future is cxl_batch_future:
-                    non_blocking_errors.append(f"Error cancelling prior batch jobs: {e}")
-                else:
-                    non_blocking_errors.append(f"Error cancelling prior check runs: {e}")
+    non_blocking_errors = cancel_prior_jobs_and_check_runs(
+        non_blocking_errors,
+        infra_config,
+        config,
+    )
 
     # This is a constructor for the configuration needed to submit AWS Batch jobs.
     # This constructor reads configuration from the environment and must be

ci_action/library/pr_resolve.py

@@ -53,9 +53,6 @@ class TestAnnotations(NamedTuple):
     # not read from the cache and will build all code.
     skip_cache: str
 
-    # Should draft pull request run all tests. Defaults to False.
-    run_on_draft: bool
-
     # If True, a 2-hour sleep will be added to the conclusion of a test.
     debug_mode: bool
 
@@ -73,6 +70,9 @@ class TestAnnotations(NamedTuple):
     # default branch. This branch must exist in `JCSDA-internal/jedi-bundle`.
     jedi_bundle_branch: str
 
+    # Should draft pull request run all tests. Defaults to False.
+    run_on_draft: bool = False
+
 
 def read_test_annotations(
         repo_uri: str,
@@ -168,11 +168,11 @@ def read_test_annotations(
     return TestAnnotations(
         build_group_map=build_group_pr_map,
         skip_cache=skip_cache,
-        run_on_draft=run_on_draft,
         debug_mode=debug_mode,
         next_ci_suffix=next_ci_suffix,
         test_select=test_select,
         jedi_bundle_branch=bundle_branch,
+        run_on_draft=run_on_draft,
     )
 
 

ci_action/main.py

@@ -171,9 +171,6 @@ def main():
         return 0
 
     workspace_dir = os.environ.get('GITHUB_WORKSPACE', os.getcwd())
-    target_repo_full_path = os.path.join(
-        workspace_dir, os.environ['TARGET_REPO_DIR'])
-
     # Get environment attributes set by GitHub.
     env_config = get_environment_config()
 
@@ -184,8 +181,7 @@ def main():
     errors, non_blocking_errors = ci_implementation.prepare_and_launch_ci_test(
         infra_config=JEDI_CI_INFRA_CONFIG,
         config=env_config,
-        bundle_repo_path=os.path.join(workspace_dir, 'bundle'),
-        target_repo_path=target_repo_full_path)
+        bundle_repo_path=os.path.join(workspace_dir, 'bundle'))
 
     # The following block is used to format a list of errors that will be logged to the GitHub
     # action log. The output should look something like this.