Skip to content

[9.0] flipped the HTTPS test flag #7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisburr merged 1 commit into from
Dec 13, 2024
Merged

[9.0] flipped the HTTPS test flag #7920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion integration_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/Jenkins/dirac-cfg-update-services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion tests/Jenkins/dirac_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading