Remove run-all-tests and replace with run-pr and run-comps

Author: Bridenbecker

.github/workflows/run-all-prod-test-curl.yml

@@ -1,19 +1,23 @@
-#Install staging nightly build of idmtools including emodpy
-# run all tests
-# trigger test with checkin commit contains "Run all test!"
-
-name: "run_all_tests"
-on: [push, pull_request, workflow_dispatch]
+# run-comps-tests.yml
+# -----------------------------------------------------------------------------
+# Run the unit/sim tests when a person is making a pull-request or pushing
+# directly to the repository.  These "sim" tests that actually run EMOD will
+# use the COMPS so that they need to access Foundation assets.  This requires
+# the GitHub secrets so the branch must be in the pull request must be part of
+# the EMOD-Hub repo.
+# -----------------------------------------------------------------------------
+
+
+name: "run-comps-tests"
+on: [push, pull_request]
 jobs:
-  run-all-tests:
+  run-comps-tests:
     runs-on: ${{ matrix.os }}
+    if: "contains(github.event.pull_request.head.repo.full_name, 'EMOD-Hub/emodpy')"
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
         python-version: [3.9]
-    env:
-      bamboo_user: ${{ secrets.PYPI_STAGING_USERNAME }}
-      bamboo_password: ${{ secrets.PYPI_STAGING_PASSWORD }}
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v4
@@ -33,7 +37,7 @@ jobs:
         run: |
           python -m pip install --upgrade -e . --extra-index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
 
-      - name: install idmtools-test and emod files from jfrog
+      - name: install test packages
         run: |
           python -m pip install --upgrade -r tests/requirements.txt 
 
@@ -47,8 +51,8 @@ jobs:
       - name: run tests
         run: |
           cd tests
-          pytest -n 0 test_download_from_package.py
-          pytest -n 10 --dist loadfile -v -m emod --junitxml="test_results.xml"
+          pytest test_download_from_package.py
+          pytest -n 10 --dist loadfile -v -m comps --junitxml="test_results.xml"
 
       - name: Upload emodpy test results
         uses: actions/upload-artifact@v4

.github/workflows/run-all-test-curl.yml

@@ -0,0 +1,60 @@
+# run-pr-tests.yml
+# -----------------------------------------------------------------------------
+# Run the unit/sim tests when a person is making a pull-request or pushing
+# directly to the repository.  These "sim" tests that actually run EMOD will
+# use the Container Platform so that they do not need to access Foundation
+# assets (i.e. COMPS).
+# -----------------------------------------------------------------------------
+
+
+name: "run-pr-tests"
+on: [push, pull_request]
+jobs:
+  run-pr-tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        python-version: [3.9]
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+
+      - name: ${{ matrix.os }} Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade py-make flake8 black
+
+      - name: Install code
+        run: |
+          python -m pip install --upgrade -e . --extra-index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
+
+      - name: install test packages
+        run: |
+          python -m pip install --upgrade -r tests/requirements.txt 
+
+      - name: run unit tests
+        run: |
+          cd tests
+          pytest test_download_from_package.py
+          pytest --dist loadfile -v -m unit --junitxml="test_results.xml"
+
+      - name: run container tests
+        if: runner.os == 'Linux'
+        run: |
+          cd tests
+          pytest test_download_from_package.py
+          pytest --dist loadfile -v -m container --junitxml="test_results.xml"
+
+      - name: Upload emodpy test results
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: emodpy_test_results
+          path: tests/test_results.xml