Merge pull request #1501 from InstituteforDiseaseModeling/release-1.6.x

Release 1.6.3 to master
InstituteforDiseaseModeling · Mar 23, 2021 · 0f65922 · 0f65922
2 parents 236cbf6 + 15bc5bf
commit 0f65922
Show file tree

Hide file tree

Showing 127 changed files with 2,590 additions and 1,210 deletions.
diff --git a/.github/workflows/pr-all-test-ubuntu-setup.yml b/.github/workflows/pr-all-test-ubuntu-setup.yml
@@ -48,6 +48,8 @@ jobs:
       - name: Run setup-dev-no-docker
         # only run if core, local, models wasn't changed
         if: steps.filter.outputs.core == 'true'
+        env:
+          BUILD_DEBUG: 1
         run: |
           make setup-dev-no-docker
       - name: login to comps2
@@ -105,6 +107,8 @@ jobs:
         if: steps.filter.outputs.core == 'true' ||  steps.filter.outputs.cli == 'true'
         run: |
           make setup-dev-no-docker
+        env:
+          BUILD_DEBUG: 1
       - name: login to comps2
         if: steps.filter.outputs.core == 'true' ||  steps.filter.outputs.cli == 'true'
         run: |
@@ -164,6 +168,8 @@ jobs:
           pip install idm-buildtools flake8 wheel --index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
       - name: Run setup-dev-no-docker
         if: steps.filter.outputs.core == 'true' || steps.filter.outputs.models == 'true'
+        env:
+          BUILD_DEBUG: 1
         run: |
           make setup-dev-no-docker
       - name: login to comps2
@@ -225,6 +231,8 @@ jobs:
           pip install idm-buildtools flake8 wheel --index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
       - name: Run setup-dev-no-docker
         if: steps.filter.outputs.core == 'true' || steps.filter.outputs.comps == 'true' || steps.filter.outputs.models == 'true'
+        env:
+          BUILD_DEBUG: 1
         run: |
           make setup-dev-no-docker
       - name: login to comps2
@@ -268,20 +276,20 @@ jobs:
             local:
               - 'idmtools_platform_local/**'
       - uses: actions/cache@v2
-        if: steps.filter.outputs.core == 'true' || steps.filter.outputs.comps == 'true' || steps.filter.outputs.models == 'true'
+        if: steps.filter.outputs.core == 'true' || steps.filter.outputs.local == 'true' || steps.filter.outputs.models == 'true'
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/*_requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: ${{ matrix.os }} Python ${{ matrix.python-version }}
-        if: steps.filter.outputs.core == 'true' || steps.filter.outputs.comps == 'true' || steps.filter.outputs.models == 'true'
+        if: steps.filter.outputs.core == 'true' || steps.filter.outputs.local == 'true' || steps.filter.outputs.models == 'true'
         uses: actions/[email protected]
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
       - name: Install Python dependencies
-        if: steps.filter.outputs.core == 'true' || steps.filter.outputs.comps == 'true' || steps.filter.outputs.models == 'true'
+        if: steps.filter.outputs.core == 'true' || steps.filter.outputs.local == 'true' || steps.filter.outputs.models == 'true'
         run: |
           pip install idm-buildtools flake8 wheel --index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
       - name: Run setup-dev
@@ -290,7 +298,7 @@ jobs:
         run: |
           make setup-dev
       - name: login to comps2
-        if: steps.filter.outputs.core == 'true' || steps.filter.outputs.comps == 'true' || steps.filter.outputs.models == 'true'
+        if: steps.filter.outputs.core == 'true' || steps.filter.outputs.local == 'true' || steps.filter.outputs.models == 'true'
         run: |
           python dev_scripts/create_auth_token_args.py --username $COMPS_USER --password $COMPS_PASSWORD
       - name: run idmtools_platform_local all tests

diff --git a/...b/workflows/run-master-prod-test-curl.yml → .../run-all-test-ubuntu-prod-master-curl.yml b/...b/workflows/run-master-prod-test-curl.yml → .../run-all-test-ubuntu-prod-master-curl.yml
@@ -8,7 +8,7 @@
 #
 # Note, this test will checkout 'master' branch
 
-name: "run-master-prod-test-curl"
+name: "run-all-test-ubuntu-prod-master-curl"
 on:
   repository_dispatch:
     # Manually trigger with above curl or Postman POST
@@ -41,6 +41,7 @@ jobs:
         run: |
           pip install idmtools[full] --index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
           pip install idmtools-test --index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
+          pip install idmtools[test] --index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
       - name: login to comps2
         run: |
           python dev_scripts/create_auth_token_args.py --username $COMPS_USER --password $COMPS_PASSWORD
@@ -49,51 +50,51 @@ jobs:
           COMPS_PASSWORD: ${{ secrets.COMPS_PASSWORD }}
       - name: run idmtools_cli tests
         run: |
-          cd idmtools_cli/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_cli test results
+          cd idmtools_cli
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_cli all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_cli_test_results
-          path: idmtools_cli/tests/test_results.xml
+          path: idmtools_cli/tests/reports/
       - name: run idmtools_core tests
         run: |
-          cd idmtools_core/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_core test results
+          cd idmtools_core
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_core all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_core_test_results
-          path: idmtools_core/tests/test_results.xml
+          path: idmtools_core/tests/reports/
       - name: run idmtools_models tests
         run: |
-          cd idmtools_models/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_models test results
+          cd idmtools_models
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_models all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_models_test_results
-          path: idmtools_models/tests/test_results.xml
+          path: idmtools_models/tests/results/
       - name: run idmtools_platform_comps tests
         run: |
-          cd idmtools_platform_comps/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
+          cd idmtools_platform_comps
+          PARALLEL_TEST_COUNT=2 make test-all
       - name: Upload idmtools_platform_comps test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_platform_comps_test_results
-          path: idmtools_platform_comps/tests/test_results.xml
+          path: idmtools_platform_comps/tests/results/
       - name: run idmtools_platform_local tests
         run: |
-          cd idmtools_platform_local/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_platform_local test results
+          cd idmtools_platform_local
+          make test-all
+      - name: Upload idmtools_platform_local all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_platform_local_test_results
-          path: idmtools_platform_local/tests/test_results.xml
+          path: idmtools_platform_local/tests/results/
diff --git a/.github/workflows/run-all-test-ubuntu-setup-curl.yml b/.github/workflows/run-all-test-ubuntu-setup-curl.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.8]
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
@@ -48,51 +48,51 @@ jobs:
           COMPS_PASSWORD: ${{ secrets.COMPS_PASSWORD }}
       - name: run idmtools_cli tests
         run: |
-          cd idmtools_cli/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_cli test results
+          cd idmtools_cli
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_cli all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_cli_test_results
-          path: idmtools_cli/tests/test_results.xml
+          path: idmtools_cli/tests/reports/
       - name: run idmtools_core tests
         run: |
-          cd idmtools_core/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_core test results
+          cd idmtools_core
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_core all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_core_test_results
-          path: idmtools_core/tests/test_results.xml
+          path: idmtools_core/tests/reports/
       - name: run idmtools_models tests
         run: |
-          cd idmtools_models/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_models test results
+          cd idmtools_models
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_models all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_models_test_results
-          path: idmtools_models/tests/test_results.xml
+          path: idmtools_models/tests/results/
       - name: run idmtools_platform_comps tests
         run: |
-          cd idmtools_platform_comps/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
+          cd idmtools_platform_comps
+          PARALLEL_TEST_COUNT=2 make test-all
       - name: Upload idmtools_platform_comps test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_platform_comps_test_results
-          path: idmtools_platform_comps/tests/test_results.xml
+          path: idmtools_platform_comps/tests/results/
       - name: run idmtools_platform_local tests
         run: |
-          cd idmtools_platform_local/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_platform_local test results
+          cd idmtools_platform_local
+          make test-all
+      - name: Upload idmtools_platform_local all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_platform_local_test_results
-          path: idmtools_platform_local/tests/test_results.xml
+          path: idmtools_platform_local/tests/results/
diff --git a/...kflows/run-all-test-ubuntu-stage-curl.yml → ...ws/run-all-test-ubuntu-stage-dev-curl.yml b/...kflows/run-all-test-ubuntu-stage-curl.yml → ...ws/run-all-test-ubuntu-stage-dev-curl.yml
@@ -8,7 +8,7 @@
 #
 # Note, this test will checkout 'dev' branch
 
-name: "run-all-test-ubuntu-stage-curl"
+name: "run-all-test-ubuntu-stage-dev-curl"
 
 on:
   repository_dispatch:
@@ -48,6 +48,7 @@ jobs:
         run: |
           pip install idmtools[full] --index-url=https://${{ env.bamboo_user }}:${{ env.bamboo_password }}@packages.idmod.org/api/pypi/pypi-staging/simple
           pip install idmtools-test --index-url=https://${{ env.bamboo_user }}:${{ env.bamboo_password }}@packages.idmod.org/api/pypi/pypi-staging/simple
+          pip install idmtools[test] --index-url=https://${{ env.bamboo_user }}:${{ env.bamboo_password }}@packages.idmod.org/api/pypi/pypi-staging/simple
       - name: login to comps2
         run: |
           python dev_scripts/create_auth_token_args.py --username $COMPS_USER --password $COMPS_PASSWORD
@@ -59,52 +60,51 @@ jobs:
           echo '${{ env.bamboo_password }}' | docker login idm-docker-staging.packages.idmod.org --username ${{ env.bamboo_user }} --password-stdin
       - name: run idmtools_cli tests
         run: |
-          cd idmtools_cli/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_cli test results
+          cd idmtools_cli
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_cli all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_cli_test_results
-          path: idmtools_cli/tests/test_results.xml
+          path: idmtools_cli/tests/reports/
       - name: run idmtools_core tests
         run: |
-          cd idmtools_core/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_core test results
+          cd idmtools_core
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_core all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_core_test_results
-          path: idmtools_core/tests/test_results.xml
+          path: idmtools_core/tests/reports/
       - name: run idmtools_models tests
         run: |
-          cd idmtools_models/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_models test results
+          cd idmtools_models
+          PARALLEL_TEST_COUNT=2 make test-all
+      - name: Upload idmtools_models all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_models_test_results
-          path: idmtools_models/tests/test_results.xml
+          path: idmtools_models/tests/results/
       - name: run idmtools_platform_comps tests
         run: |
-          cd idmtools_platform_comps/tests
-          py.test --durations=3 -v --junitxml=test_results.xml
+          cd idmtools_platform_comps
+          PARALLEL_TEST_COUNT=2 make test-all
       - name: Upload idmtools_platform_comps test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_platform_comps_test_results
-          path: idmtools_platform_comps/tests/test_results.xml
+          path: idmtools_platform_comps/tests/results/
       - name: run idmtools_platform_local tests
         run: |
-          cd idmtools_platform_local/tests
-          export DOCKER_REPO=idm-docker-staging
-          py.test --durations=3 -v --junitxml=test_results.xml
-      - name: Upload idmtools_platform_local test results
+          cd idmtools_platform_local
+          make test-all
+      - name: Upload idmtools_platform_local all test results
         uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: idmtools_platform_local_test_results
-          path: idmtools_platform_local/tests/test_results.xml
+          path: idmtools_platform_local/tests/results/