Fix tests

DIRACGrid · Jul 21, 2020 · af4171f · af4171f
1 parent 5b62846
commit af4171f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -40,8 +40,8 @@ jobs:
           - SERVER_USE_M2CRYPTO: No
             CLIENT_USE_M2CRYPTO: No
           # Fail deprecation
-          # IMPLICIT: DIRAC_DEPRECATED_FAIL: No
-          - DIRAC_DEPRECATED_FAIL: Yes
+          # IMPLICIT: DEPRECATED_FAIL: No
+          - DEPRECATED_FAIL: Yes
 
 
     steps:
@@ -62,7 +62,7 @@ jobs:
         echo -n "-e CI_MERGE_REQUEST_TARGET_BRANCH_NAME=$GITHUB_BASE_REF " >> run_in_container
         echo -n "-e CI_REGISTRY_IMAGE=diracgrid " >> run_in_container
         echo -n "-e MYSQL_VER=${{ matrix.MYSQL_VER || env.MATRIX_DEFAULT_MYSQL_VER }} " >> run_in_container
-        echo -n "-e DIRAC_DEPRECATED_FAIL=${{ matrix.DIRAC_DEPRECATED_FAIL || env.MATRIX_DEFAULT_DEPRECATED_FAIL }} " >> run_in_container
+        if [[ "${{ matrix.DEPRECATED_FAIL || env.MATRIX_DEFAULT_DEPRECATED_FAIL }}" != "No" ]]; then echo -n "-e DIRAC_DEPRECATED_FAIL=${{ matrix.DEPRECATED_FAIL || env.MATRIX_DEFAULT_DEPRECATED_FAIL }} " >> run_in_container; fi
         echo -n "-e ES_VER=${{ matrix.ES_VER || env.MATRIX_DEFAULT_ES_VER }} " >> run_in_container
         if [[ "${{ matrix.USE_NEWTHREADPOOL || env.MATRIX_DEFAULT_USE_NEWTHREADPOOL }}" != "default" ]]; then echo -n "-e DIRAC_USE_NEWTHREADPOOL=${{ matrix.USE_NEWTHREADPOOL || env.MATRIX_DEFAULT_USE_NEWTHREADPOOL }} " >> run_in_container; fi
         echo -n "-e SERVER_USE_M2CRYPTO=${{ matrix.SERVER_USE_M2CRYPTO || env.MATRIX_DEFAULT_SERVER_USE_M2CRYPTO }} " >> run_in_container

diff --git a/tests/CI/run_docker_setup.sh b/tests/CI/run_docker_setup.sh
@@ -97,7 +97,6 @@ prepareEnvironment() {
     echo ""
     echo "# Test specific variables"
     echo "export WORKSPACE=${WORKSPACE}"
-    echo "export DIRAC_DEPRECATED_FAIL=${DIRAC_DEPRECATED_FAIL}"
     echo ""
     echo "# Optional parameters"