Activate long tests on branch release/8.8.x (#2538)

AntaresSimulatorTeam · Dec 19, 2024 · 2b6cd14 · 2b6cd14
1 parent 453af56
commit 2b6cd14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 25 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -25,8 +25,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ github.token }}
   IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
-  RUN_SIMPLE_TESTS: false
-  RUN_EXTENDED_TESTS: false
+  RUN_EXTENDED_TESTS: ${{ inputs.target_branch == 'release/8.8.x' }}
   REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}}
   VCPKG_ROOT: ${{ github.workspace }}/vcpkg
   vcpkgPackages: yaml-cpp antlr4
@@ -166,7 +165,6 @@ jobs:
 
 
     - name: Run named mps tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
@@ -175,13 +173,11 @@ jobs:
         variant: "named-mps"
 
     - name: Run unfeasibility-related tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       run: |
            cd _build
            ctest -C Release --output-on-failure -R "^unfeasible$"
 
     - name: Run unit and end-to-end tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       run: |
            cd _build
            ctest -C Release --output-on-failure -L "unit|end-to-end"
@@ -194,15 +190,13 @@ jobs:
         path: ${{ github.workspace }}/_build/Testing/Temporary/LastTest.log
 
     - name: Run tests about infinity on BCs RHS
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: valid-v830
         os: ${{ env.os }}
 
     - name: Run MILP with CBC
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
@@ -211,39 +205,34 @@ jobs:
         os: ${{ env.os }}
 
     - name: Run tests introduced in v860
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: valid-v860
         os: ${{ env.os }}
 
     - name: Run tests introduced in v870
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: valid-v870
         os: ${{ env.os }}
 
     - name: Run short-tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: short-tests
         os: ${{ env.os }}
 
     - name: Run mps tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: valid-mps
         os: ${{ env.os }}
 
     - name: Run tests on adequacy patch
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}

diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
@@ -25,8 +25,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ github.token }}
   IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
-  RUN_SIMPLE_TESTS: false
-  RUN_EXTENDED_TESTS: false
+  RUN_EXTENDED_TESTS: ${{ inputs.target_branch == 'release/8.8.x' }}
   REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}}
 
 
@@ -168,7 +167,6 @@ jobs:
         prop_path: 'version'
 
     - name: Run named mps tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
@@ -177,13 +175,11 @@ jobs:
         variant: "named-mps"
 
     - name: Run unfeasibility-related tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       run: |
            cd _build
            ctest -C Release --output-on-failure -R "^unfeasible$"
 
     - name: Run unit and end-to-end tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       run: |
            cd _build
            ctest -C Release --output-on-failure -L "unit|end-to-end" -LE ortools
@@ -196,15 +192,13 @@ jobs:
         path: ${{ github.workspace }}/src/tests/mps
 
     - name: Run tests about infinity on BCs RHS
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: valid-v830
         os: ${{ env.test-platform }}
 
     - name: Run MILP with CBC
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
@@ -213,45 +207,40 @@ jobs:
         os: ${{ env.test-platform }}
 
     - name: Run tests introduced in v860
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: valid-v860
         os: ${{ env.test-platform }}
 
     - name: Run tests introduced in v870
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: valid-v870
         os: ${{ env.test-platform }}
 
     - name: Run short-tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: short-tests
         os: ${{ env.test-platform }}
 
     - name: Run mps tests
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: valid-mps
         os: ${{ env.test-platform }}
 
     - name: Run tests on adequacy patch
-      if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
       uses: ./.github/workflows/run-tests
       with:
         simtest-tag: ${{steps.simtest-version.outputs.prop}}
         batch-name: adequacy-patch-CSR
         os: ${{ env.test-platform }}
-    
+
 
     - name: Run parallel tests
       if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}