From 639129c9631423847d01dd4a64f77fe55c293108 Mon Sep 17 00:00:00 2001 From: fabrizzio-dotCMS Date: Thu, 13 Aug 2026 17:15:49 -0600 Subject: [PATCH] chore(opensearch): bump OS 3.x test environments to 3.8.0 (#37059) Every OpenSearch 3.x target was pinned to 3.4.0 or older while 3.8.0 is the latest release. Bumps all of them and aligns the two that had drifted apart: the it-test compose fallback (3.0.0) was older than what Maven actually injects from environment.properties (3.4.0). - single-node-os-migration: opensearch 3.4.0 -> 3.8.0, opensearch-dashboards 3.0.0 -> 3.8.0 - environments/environment.properties: docker.image.search.upgrade -> 3.8.0 - it-test/docker-compose.yml: OS_IMAGE_UPGRADE default -> 3.8.0 - docs: migration tester guide + example README now say 3.8 docker.image.search.upgrade drives the opensearch-upgrade Maven profile and the phase suites, so OpenSearchUpgradeSuite and the phase sweep run against 3.8.0 from here on -- that is the compatibility check this bump needs. The OS 1.x images (opensearch:1 / 1.3.6) are untouched: they are the product baseline, not an OS 3.x test env. Co-Authored-By: Claude Opus 5 (1M context) --- .../single-node-os-migration/README.md | 2 +- .../single-node-os-migration/docker-compose.yml | 6 +++--- docs/backend/OPENSEARCH_MIGRATION_TESTER_GUIDE.md | 4 ++-- dotCMS/src/docker-compose/it-test/docker-compose.yml | 2 +- environments/environment.properties | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/docker-compose-examples/single-node-os-migration/README.md b/docker/docker-compose-examples/single-node-os-migration/README.md index efae4c1480a6..96c249005f93 100644 --- a/docker/docker-compose-examples/single-node-os-migration/README.md +++ b/docker/docker-compose-examples/single-node-os-migration/README.md @@ -7,7 +7,7 @@ Runs two OpenSearch clusters side-by-side for ES → OpenSearch migration testin | OpenSearch 1.x (primary) | 1.3.x | https://localhost:9200 | | OpenSearch 3.x (shadow) | 3.8.0 | https://localhost:9201 | | OS 1.x Dashboards | 1.3.x | http://localhost:5601 | -| OS 3.x Dashboards | 3.0.0 | http://localhost:5602 | +| OS 3.x Dashboards | 3.8.0 | http://localhost:5602 | | dotCMS | latest | http://localhost:8082 | | Glowroot | - | http://localhost:4000 | | PostgreSQL | 18 | localhost:5432 | diff --git a/docker/docker-compose-examples/single-node-os-migration/docker-compose.yml b/docker/docker-compose-examples/single-node-os-migration/docker-compose.yml index 9a6b37110657..4ac1531cf8ae 100644 --- a/docker/docker-compose-examples/single-node-os-migration/docker-compose.yml +++ b/docker/docker-compose-examples/single-node-os-migration/docker-compose.yml @@ -2,7 +2,7 @@ # # Runs BOTH search backends side-by-side for the OS 1.x → OS 3.x migration: # - OpenSearch 1.3.x + OS Dashboards 1.3.x → http://localhost:5601 -# - OpenSearch 3.8.0 + OS Dashboards 3.0.0 → http://localhost:5602 +# - OpenSearch 3.8.0 + OS Dashboards 3.8.0 → http://localhost:5602 # # dotCMS is configured to write to OpenSearch 1.x (primary) while OpenSearch 3.x # shadows the traffic. Flip DOT_ES_ENDPOINTS to the opensearch3 service URL @@ -128,11 +128,11 @@ services: restart: unless-stopped # --------------------------------------------------------------------------- - # OpenSearch Dashboards 3.0.0 + # OpenSearch Dashboards 3.8.0 # UI → http://localhost:5602 # --------------------------------------------------------------------------- opensearch3-dashboards: - image: opensearchproject/opensearch-dashboards:3.0.0 + image: opensearchproject/opensearch-dashboards:3.8.0 environment: OPENSEARCH_HOSTS: '["https://opensearch3:9200"]' opensearch.ssl.verificationMode: "none" diff --git a/docs/backend/OPENSEARCH_MIGRATION_TESTER_GUIDE.md b/docs/backend/OPENSEARCH_MIGRATION_TESTER_GUIDE.md index d58b28124e6b..535de388514b 100644 --- a/docs/backend/OPENSEARCH_MIGRATION_TESTER_GUIDE.md +++ b/docs/backend/OPENSEARCH_MIGRATION_TESTER_GUIDE.md @@ -38,7 +38,7 @@ neutral names: - **Target engine** — **OpenSearch 3.x**, the engine we are migrating *to* (the "new" one). > In the lab stack below, the source engine is **OpenSearch 1.3** (standing in for a legacy -> Elasticsearch / OpenSearch 1.x deployment) and the target engine is **OpenSearch 3.4**. The concepts +> Elasticsearch / OpenSearch 1.x deployment) and the target engine is **OpenSearch 3.8**. The concepts > are identical if the source is real Elasticsearch — see the *Elasticsearch variant* note in §4. ### Concepts in two minutes @@ -154,7 +154,7 @@ docker compose up -d | dotCMS | app under test | http://localhost:8082 | Admin UI + REST API. Login `admin` / `admin`. | | Source engine (OpenSearch 1.3) | "old" engine | https://localhost:9200 | HTTPS + auth. | | Source dashboards | inspect source indices | http://localhost:5601 | Login `admin` / `admin`. | -| Target engine (OpenSearch 3.4) | "new" engine | https://localhost:9201 | HTTPS + auth. | +| Target engine (OpenSearch 3.8) | "new" engine | https://localhost:9201 | HTTPS + auth. | | Target dashboards | inspect target indices | http://localhost:5602 | Login `admin` / `Dev!Search3-Kx9mP-2026`. | | Glowroot | JVM profiler | http://localhost:4000 | Optional. | | PostgreSQL | database | *(not published to host)* | Reach it via `docker compose exec db …` — see §6. | diff --git a/dotCMS/src/docker-compose/it-test/docker-compose.yml b/dotCMS/src/docker-compose/it-test/docker-compose.yml index 16b27fa6e7c9..e9db1eaf6b96 100644 --- a/dotCMS/src/docker-compose/it-test/docker-compose.yml +++ b/dotCMS/src/docker-compose/it-test/docker-compose.yml @@ -37,7 +37,7 @@ services: - es_net opensearch-test-upgrade: - image: ${OS_IMAGE_UPGRADE:-opensearchproject/opensearch:3.0.0} + image: ${OS_IMAGE_UPGRADE:-opensearchproject/opensearch:3.8.0} environment: - cluster.name=opensearch-upgrade-cluster - node.name=opensearch-upgrade-node diff --git a/environments/environment.properties b/environments/environment.properties index eaf48ce350af..50f0e19af74e 100644 --- a/environments/environment.properties +++ b/environments/environment.properties @@ -1,7 +1,7 @@ mvn.environment.name=${env.BUILD_ENV:dev} default.context.name=default docker.image.search=opensearchproject/opensearch:1.3.6 -docker.image.search.upgrade=opensearchproject/opensearch:3.4.0 +docker.image.search.upgrade=opensearchproject/opensearch:3.8.0 docker.image.postgres=pgvector/pgvector:pg18 postman.collections=Maintenance_Resource docker.image.wiremock=wiremock/wiremock:3.5.3