From 84c1271d98400cf1f4e66d9f1016d42af5a900d8 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 24 May 2023 21:32:34 +0000 Subject: [PATCH 1/3] Make manifests / jenkinsfile use new node in #3552 Signed-off-by: Peter Zhu --- .../perf-test.jenkinsfile | 2 +- .../integ-test.jenkinsfile | 6 +- jenkins/opensearch/integ-test.jenkinsfile | 4 +- jenkins/opensearch/perf-test.jenkinsfile | 2 +- .../rpm-validation/rpm-validation.jenkinsfile | 2 +- .../2.7.1/opensearch-dashboards-2.7.1.yml | 2 +- manifests/2.8.0/opensearch-2.8.0-test.yml | 107 ++++++++++++++++++ .../opensearch-dashboards-2.8.0-test.yml | 82 ++++++++++++++ .../2.8.0/opensearch-dashboards-2.8.0.yml | 2 +- .../opensearch-dashboards-3.0.0-test.yml | 2 +- .../3.0.0/opensearch-dashboards-3.0.0.yml | 2 +- .../opensearch-dashboards/1.x/manifest.yml | 2 +- .../opensearch-dashboards/2.x/manifest.yml | 2 +- .../opensearch-dashboards/3.x/manifest.yml | 2 +- .../default/manifest.yml | 2 +- 15 files changed, 205 insertions(+), 16 deletions(-) create mode 100644 manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml diff --git a/jenkins/cross-cluster-replication/perf-test.jenkinsfile b/jenkins/cross-cluster-replication/perf-test.jenkinsfile index b937bc7d7f..5871d02274 100644 --- a/jenkins/cross-cluster-replication/perf-test.jenkinsfile +++ b/jenkins/cross-cluster-replication/perf-test.jenkinsfile @@ -10,7 +10,7 @@ pipeline { } environment { AGENT_LABEL = 'Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Perf-Test' - AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v1' + AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v2' BUNDLE_MANIFEST = 'bundle-manifest.yml' JOB_NAME = 'ccr-perf-test' } diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index 4d14660e0d..7105d9a73d 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -4,9 +4,9 @@ lib = library(identifier: 'jenkins@4.1.1', retriever: modernSCM([ ])) def docker_images = [ - "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2", - "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1", - "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v1", + "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v3", + "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2", + "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v2", ] def docker_args = [ diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index b99367e616..0011f83bf3 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -5,8 +5,8 @@ lib = library(identifier: 'jenkins@4.1.1', retriever: modernSCM([ def docker_images = [ "tar": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2", - "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1", - "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v1", + "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2", + "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v2", ] def docker_args = [ diff --git a/jenkins/opensearch/perf-test.jenkinsfile b/jenkins/opensearch/perf-test.jenkinsfile index b83903b83d..e183f0ef4c 100644 --- a/jenkins/opensearch/perf-test.jenkinsfile +++ b/jenkins/opensearch/perf-test.jenkinsfile @@ -10,7 +10,7 @@ pipeline { } environment { AGENT_LABEL = 'Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Perf-Test' - AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v1' + AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v2' BUNDLE_MANIFEST = 'bundle-manifest.yml' JOB_NAME = 'perf-test' } diff --git a/jenkins/rpm-validation/rpm-validation.jenkinsfile b/jenkins/rpm-validation/rpm-validation.jenkinsfile index c73b3205f3..365433a7fb 100644 --- a/jenkins/rpm-validation/rpm-validation.jenkinsfile +++ b/jenkins/rpm-validation/rpm-validation.jenkinsfile @@ -27,7 +27,7 @@ pipeline { agent { docker { label AGENT_LABEL - image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1' + image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2' args '--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro' registryUrl 'https://public.ecr.aws/' alwaysPull true diff --git a/manifests/2.7.1/opensearch-dashboards-2.7.1.yml b/manifests/2.7.1/opensearch-dashboards-2.7.1.yml index 1637da6c94..03d1414c00 100644 --- a/manifests/2.7.1/opensearch-dashboards-2.7.1.yml +++ b/manifests/2.7.1/opensearch-dashboards-2.7.1.yml @@ -5,7 +5,7 @@ build: version: 2.7.1 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/2.8.0/opensearch-2.8.0-test.yml b/manifests/2.8.0/opensearch-2.8.0-test.yml index 8a5bf64fc7..353e7f6b32 100644 --- a/manifests/2.8.0/opensearch-2.8.0-test.yml +++ b/manifests/2.8.0/opensearch-2.8.0-test.yml @@ -6,6 +6,34 @@ ci: name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 args: -e JAVA_HOME=/opt/java/openjdk-17 components: + - name: alerting + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + plugins.destination.host.deny_list: [10.0.0.0/8, 127.0.0.1] + bwc-test: + test-configs: + - with-security + + - name: anomaly-detection + integ-test: + build-dependencies: + - job-scheduler + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + + - name: asynchronous-search + integ-test: + test-configs: + - with-security + - without-security + - name: cross-cluster-replication integ-test: topology: @@ -19,7 +47,86 @@ components: - with-security - without-security + - name: geospatial + integ-test: + test-configs: + - with-security + - without-security + + - name: index-management + integ-test: + build-dependencies: + - job-scheduler + test-configs: + - with-security + - without-security + additional-cluster-configs: + path.repo: [/tmp] + bwc-test: + test-configs: + - with-security + + - name: k-NN + integ-test: + test-configs: + - with-security + - without-security + + - name: ml-commons + integ-test: + test-configs: + - with-security + - without-security + + - name: neural-search + integ-test: + test-configs: + - with-security + - without-security + + - name: notifications + working-directory: notifications + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + + - name: opensearch-observability + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + + - name: opensearch-reports + integ-test: + test-configs: + - with-security + - without-security + - name: security integ-test: test-configs: - with-security + + - name: security-analytics + integ-test: + test-configs: + - with-security + - without-security + + - name: sql + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + script.context.field.max_compilations_rate: 1000/1m + bwc-test: + test-configs: + - with-security diff --git a/manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml b/manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml new file mode 100644 index 0000000000..7f3e2c03fb --- /dev/null +++ b/manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml @@ -0,0 +1,82 @@ +--- +schema-version: '1.0' +name: OpenSearch Dashboards +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2 +components: + - name: OpenSearch-Dashboards + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + vis_builder.enabled: true + data_source.enabled: true + - name: alertingDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: anomalyDetectionDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: ganttChartDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: indexManagementDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: observabilityDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: queryWorkbenchDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: reportsDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: securityDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: notificationsDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: customImportMapDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: searchRelevanceDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: securityAnalyticsDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: mlCommonsDashboards + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + ml_commons_dashboards.enabled: true diff --git a/manifests/2.8.0/opensearch-dashboards-2.8.0.yml b/manifests/2.8.0/opensearch-dashboards-2.8.0.yml index fefce8f7af..ddf7bf1b91 100644 --- a/manifests/2.8.0/opensearch-dashboards-2.8.0.yml +++ b/manifests/2.8.0/opensearch-dashboards-2.8.0.yml @@ -5,7 +5,7 @@ build: version: 2.8.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml index 39c7a6bc6d..9191335905 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch Dashboards ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2 + name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v3 components: - name: OpenSearch-Dashboards bwc-test: diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml index 52ba3536aa..ee615e7b5b 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -5,7 +5,7 @@ build: version: 3.0.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/1.x/manifest.yml b/manifests/templates/opensearch-dashboards/1.x/manifest.yml index ef01447725..548516212d 100644 --- a/manifests/templates/opensearch-dashboards/1.x/manifest.yml +++ b/manifests/templates/opensearch-dashboards/1.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/2.x/manifest.yml b/manifests/templates/opensearch-dashboards/2.x/manifest.yml index 9074cf5d0b..9d33c0691c 100644 --- a/manifests/templates/opensearch-dashboards/2.x/manifest.yml +++ b/manifests/templates/opensearch-dashboards/2.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/3.x/manifest.yml b/manifests/templates/opensearch-dashboards/3.x/manifest.yml index ef01447725..548516212d 100644 --- a/manifests/templates/opensearch-dashboards/3.x/manifest.yml +++ b/manifests/templates/opensearch-dashboards/3.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/default/manifest.yml b/manifests/templates/opensearch-dashboards/default/manifest.yml index 9074cf5d0b..9d33c0691c 100644 --- a/manifests/templates/opensearch-dashboards/default/manifest.yml +++ b/manifests/templates/opensearch-dashboards/default/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git From 9471b9ac520a96d132e9a813a5b94312e1e23415 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 24 May 2023 21:07:32 -0400 Subject: [PATCH 2/3] More changes to the python test match image versions Signed-off-by: Peter Zhu --- tests/tests_manifests_workflow/test_input_manifests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py index e2ca300018..99b321a7a4 100644 --- a/tests/tests_manifests_workflow/test_input_manifests.py +++ b/tests/tests_manifests_workflow/test_input_manifests.py @@ -74,7 +74,7 @@ def test_create_manifest_opensearch_dashboards(self) -> None: { "schema-version": "1.0", "build": {"name": "OpenSearch Dashboards", "version": "1.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2", }}, + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3", }}, }, ) @@ -86,7 +86,7 @@ def test_create_manifest_opensearch_dashboards_from_default(self) -> None: { "schema-version": "1.0", "build": {"name": "OpenSearch Dashboards", "version": "4.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2", }}, + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3", }}, }, ) From 14f4fb4b920c5ef36a0e3c2e14efc483e888fcdf Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 24 May 2023 21:13:51 -0400 Subject: [PATCH 3/3] Update OSD integTest runner with v3 images Signed-off-by: Peter Zhu --- manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml b/manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml index 7f3e2c03fb..a325979ad1 100644 --- a/manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml +++ b/manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch Dashboards ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2 + name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v3 components: - name: OpenSearch-Dashboards integ-test: