Skip to content
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.

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

fix(#9187): fix haproxy version to 2.6.17 - 4.8.x #9190

Merged
merged 2 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion haproxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM haproxy:2.6
FROM haproxy:2.6.17

USER root
RUN apt-get update && apt-get install luarocks gettext jq curl -y
Expand Down
1 change: 0 additions & 1 deletion haproxy/tests/compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.7"
services:
haproxy:
build:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"wdio-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/default/wdio.conf.js",
"-- CI SCRIPTS ": "-----------------------------------------------------------------------------------------------",
"build": "./scripts/build/build-ci.sh",
"ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run build && npm run integration-api && npm run unit && npm run unit-nginx && npm run unit-haproxy && npm run unit-haproxy-healthcheck",
"ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run unit-nginx && npm run unit-haproxy && npm run unit-haproxy-healthcheck && npm run build && npm run integration-api && npm run unit",
"ci-integration-all": "mocha --config tests/integration/.mocharc-all.js",
"ci-integration-all-k3d": "mocha --config tests/integration/.mocharc-k3d.js",
"ci-integration-sentinel": "mocha --config tests/integration/.mocharc-sentinel.js",
Expand Down
6 changes: 5 additions & 1 deletion tests/e2e/upgrade/upgrade.wdio-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ describe('Performing an upgrade', () => {
await (await upgradePage.deploymentInProgress()).waitForDisplayed();
await (await upgradePage.deploymentInProgress()).waitForDisplayed({ reverse: true, timeout: 100000 });

await (await upgradePage.deploymentComplete()).waitForDisplayed();
if (testFrontend) {
// Old admin pages will not show the correct deployment complete message because of a change in API
// https://github.com/medic/cht-core/issues/9186
await (await upgradePage.deploymentComplete()).waitForDisplayed();
}

const currentVersion = await upgradePage.getCurrentVersion();
expect(version.getVersion(true)).to.include(currentVersion);
Expand Down