fix(#9187): fix haproxy version to 2.6.17

Fixes haproxy image to 2.6.17
Skips waiting for deployment complete when upgrading from an old version.

#9187
#9186

haproxy/Dockerfile

@@ -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

haproxy/tests/compose.yml

@@ -1,4 +1,3 @@
-version: "3.7"
 services:
  haproxy:
  build:

package.json

@@ -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",

tests/e2e/upgrade/upgrade.wdio-spec.js

@@ -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);