From 17d0c60142eea2fa505bb60a49c3cf5e37725a4c Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Fri, 29 Nov 2024 15:37:02 +0100 Subject: [PATCH] test: flipped the HTTPS test flag --- .github/workflows/integration.yml | 4 ++-- integration_tests.py | 2 +- tests/Jenkins/dirac-cfg-update-services.py | 2 +- tests/Jenkins/dirac_ci.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index bf4a50f24af..8eeaed3ac25 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -33,8 +33,8 @@ jobs: include: - TEST_NAME: "MariaDB 11.4, elasticsearch:7.9.1" ARGS: MYSQL_VER=mariadb:11.4.3 ES_VER=elasticsearch:7.9.1 - - TEST_NAME: "DIPS" - ARGS: TEST_HTTPS=No + - TEST_NAME: "HTTPS" + ARGS: TEST_HTTPS=Yes - TEST_NAME: "Force DEncode" ARGS: DIRAC_USE_JSON_ENCODE=NO - TEST_NAME: "Backward Compatibility" diff --git a/integration_tests.py b/integration_tests.py index 1aed8dae73f..a6dc305774a 100755 --- a/integration_tests.py +++ b/integration_tests.py @@ -29,7 +29,7 @@ FEATURE_VARIABLES = { "DIRACOSVER": "master", "DIRACOS_TARBALL_PATH": None, - "TEST_HTTPS": "Yes", + "TEST_HTTPS": "No", "TEST_DIRACX": "No", "DIRAC_FEWER_CFG_LOCKS": None, "DIRAC_USE_JSON_ENCODE": None, diff --git a/tests/Jenkins/dirac-cfg-update-services.py b/tests/Jenkins/dirac-cfg-update-services.py index 3d618d095c5..889d3ba1739 100644 --- a/tests/Jenkins/dirac-cfg-update-services.py +++ b/tests/Jenkins/dirac-cfg-update-services.py @@ -54,7 +54,7 @@ fc = "FileCatalog" multiFC = "MultiVOFileCatalog" -if os.environ.get("TEST_HTTPS", "Yes") == "Yes": +if os.environ.get("TEST_HTTPS", "No") == "Yes": fc = f"Tornado{fc}" multiFC = f"Tornado{multiFC}" diff --git a/tests/Jenkins/dirac_ci.sh b/tests/Jenkins/dirac_ci.sh index 58d05702bcf..58baab333c3 100644 --- a/tests/Jenkins/dirac_ci.sh +++ b/tests/Jenkins/dirac_ci.sh @@ -282,7 +282,7 @@ fullInstallDIRAC() { #Now all the rest # slave CS - if [[ "${TEST_HTTPS:-Yes}" = "Yes" ]]; then + if [[ "${TEST_HTTPS:-Yes}" = "No" ]]; then if ! dirac-install-component Configuration TornadoConfiguration "${DEBUG}"; then echo 'ERROR: dirac-install-component failed' >&2 exit 1