diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 63f4beaee0a..2ca5bef656c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -5,12 +5,14 @@ on: [push, pull_request] jobs: Integration: runs-on: ubuntu-latest + continue-on-error: ${{ matrix.experimental }} if: github.event_name != 'push' || github.repository == 'DIRACGrid/DIRAC' timeout-minutes: 45 env: MATRIX_DEFAULT_MYSQL_VER: 5.7 MATRIX_DEFAULT_HOST_OS: cc7 + MATRIX_DEFAULT_DEPRECATED_FAIL: No MATRIX_DEFAULT_USE_NEWTHREADPOOL: default MATRIX_DEFAULT_SERVER_USE_M2CRYPTO: Yes MATRIX_DEFAULT_CLIENT_USE_M2CRYPTO: Yes @@ -18,6 +20,7 @@ jobs: strategy: fail-fast: False matrix: + experimental: [false] include: ###### MySQL versions - MYSQL_VER: 5.6 @@ -38,6 +41,11 @@ jobs: CLIENT_USE_M2CRYPTO: Yes - SERVER_USE_M2CRYPTO: No CLIENT_USE_M2CRYPTO: No + ###### Fail deprecation + # IMPLICIT: DEPRECATED_FAIL: No + - DEPRECATED_FAIL: Yes + experimental: true + steps: - uses: actions/checkout@v2 @@ -57,6 +65,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 + 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 index 46d9fb34bd7..9fe87406c00 100755 --- a/tests/CI/run_docker_setup.sh +++ b/tests/CI/run_docker_setup.sh @@ -97,6 +97,9 @@ prepareEnvironment() { echo "" echo "# Test specific variables" echo "export WORKSPACE=${WORKSPACE}" + if [[ -n "${DIRAC_DEPRECATED_FAIL+x}" ]]; then + echo "export DIRAC_DEPRECATED_FAIL=${DIRAC_DEPRECATED_FAIL}" + fi echo "" echo "# Optional parameters"