Merge pull request DIRACGrid#7920 from fstagni/90_tornado_flip

[9.0] flipped the HTTPS test flag
DIRACGridBot · Dec 13, 2024 · 8a6cf6b · 8a6cf6b
2 parents d4c3de2 + 17d0c60
commit 8a6cf6b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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