From cd2fb92a84f1d37490c3a53199a4fe4979b3ee56 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Thu, 8 Feb 2024 08:59:07 -0500 Subject: [PATCH 1/4] Add 2.13.0 manifests Signed-off-by: Andriy Redko --- jenkins/check-for-build.jenkinsfile | 2 + ...ensearch-2.13.0-concurrent-search-test.yml | 210 ++++++++++++++++++ manifests/2.13.0/opensearch-2.13.0-test.yml | 151 +++++++++++++ manifests/2.13.0/opensearch-2.13.0.yml | 185 +++++++++++++++ .../opensearch-dashboards-2.13.0-test.yml | 89 ++++++++ .../2.13.0/opensearch-dashboards-2.13.0.yml | 57 +++++ 6 files changed, 694 insertions(+) create mode 100644 manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml create mode 100644 manifests/2.13.0/opensearch-2.13.0-test.yml create mode 100644 manifests/2.13.0/opensearch-2.13.0.yml create mode 100644 manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml create mode 100644 manifests/2.13.0/opensearch-dashboards-2.13.0.yml diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index 75d871e6b2..714c332feb 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -25,6 +25,8 @@ pipeline { parameterizedCron ''' H 1 * * * %INPUT_MANIFEST=1.3.15/opensearch-dashboards-1.3.15.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip H 1 * * * %INPUT_MANIFEST=1.3.15/opensearch-1.3.15.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip + H */1 * * * %INPUT_MANIFEST=2.13.0/opensearch-dashboards-2.13.0.yml;TEST_MANIFEST=2.13.0/opensearch-dashboards-2.13.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip + H */1 * * * %INPUT_MANIFEST=2.13.0/opensearch-2.13.0.yml;TEST_MANIFEST=2.13.0/opensearch-2.13.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip H */6 * * * %INPUT_MANIFEST=2.12.0/opensearch-dashboards-2.12.0.yml;TEST_MANIFEST=2.12.0/opensearch-dashboards-2.12.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip H */6 * * * %INPUT_MANIFEST=2.12.0/opensearch-2.12.0.yml;TEST_MANIFEST=2.12.0/opensearch-2.12.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip diff --git a/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml b/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml new file mode 100644 index 0000000000..75a9dd4a02 --- /dev/null +++ b/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml @@ -0,0 +1,210 @@ +--- +schema-version: '1.0' +name: OpenSearch +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 + args: -e JAVA_HOME=/opt/java/openjdk-17 +components: + - name: index-management + integ-test: + build-dependencies: + - job-scheduler + test-configs: + - with-security + - without-security + additional-cluster-configs: + path.repo: [/tmp] + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + bwc-test: + test-configs: + - with-security + + - name: anomaly-detection + integ-test: + build-dependencies: + - job-scheduler + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + bwc-test: + test-configs: + - with-security + + - name: asynchronous-search + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - 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] + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + bwc-test: + test-configs: + - with-security + + - name: notifications + working-directory: notifications + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + bwc-test: + test-configs: + - with-security + + - name: sql + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + script.context.field.max_compilations_rate: 1000/1m + plugins.query.datasources.encryption.masterkey: 4fc8fee6a3fd7d6ca01772e5 + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + bwc-test: + test-configs: + - with-security + + - name: k-NN + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: neural-search + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: opensearch-reports + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: opensearch-observability + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + bwc-test: + test-configs: + - with-security + + - name: ml-commons + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: cross-cluster-replication + integ-test: + topology: + - cluster_name: leader + data_nodes: 2 + cluster_manager_nodes: 0 + - cluster_name: follower + data_nodes: 2 + cluster_manager_nodes: 0 + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: security + integ-test: + test-configs: + - with-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: geospatial + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: security-analytics + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: custom-codecs + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 + + - name: skills + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 diff --git a/manifests/2.13.0/opensearch-2.13.0-test.yml b/manifests/2.13.0/opensearch-2.13.0-test.yml new file mode 100644 index 0000000000..25cc666956 --- /dev/null +++ b/manifests/2.13.0/opensearch-2.13.0-test.yml @@ -0,0 +1,151 @@ +--- +schema-version: '1.0' +name: OpenSearch +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 + args: -e JAVA_HOME=/opt/java/openjdk-21 +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: flow-framework + integ-test: + test-configs: + - with-security + - without-security + + - name: asynchronous-search + integ-test: + test-configs: + - with-security + - without-security + + - name: cross-cluster-replication + integ-test: + topology: + - cluster_name: leader + data_nodes: 2 + cluster_manager_nodes: 0 + - cluster_name: follower + data_nodes: 2 + cluster_manager_nodes: 0 + test-configs: + - 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 + plugins.query.datasources.encryption.masterkey: 4fc8fee6a3fd7d6ca01772e5 + bwc-test: + test-configs: + - with-security + + - name: custom-codecs + integ-test: + test-configs: + - with-security + - without-security + + - name: skills + integ-test: + test-configs: + - with-security + - without-security diff --git a/manifests/2.13.0/opensearch-2.13.0.yml b/manifests/2.13.0/opensearch-2.13.0.yml new file mode 100644 index 0000000000..f9590bb816 --- /dev/null +++ b/manifests/2.13.0/opensearch-2.13.0.yml @@ -0,0 +1,185 @@ +--- +schema-version: '1.1' +build: + name: OpenSearch + version: 2.13.0 +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 + args: -e JAVA_HOME=/opt/java/openjdk-21 +components: + - name: OpenSearch + repository: https://github.com/opensearch-project/OpenSearch.git + ref: 2.x + - name: common-utils + repository: https://github.com/opensearch-project/common-utils.git + ref: 2.x + platforms: + - linux + - windows + - name: job-scheduler + repository: https://github.com/opensearch-project/job-scheduler.git + ref: 2.x + platforms: + - linux + - windows + - name: security + repository: https://github.com/opensearch-project/security.git + ref: 2.x + platforms: + - linux + - windows + - name: k-NN + repository: https://github.com/opensearch-project/k-NN.git + ref: 2.x + platforms: + - linux + - windows + - name: geospatial + repository: https://github.com/opensearch-project/geospatial.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - job-scheduler + - name: cross-cluster-replication + repository: https://github.com/opensearch-project/cross-cluster-replication.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - name: ml-commons + repository: https://github.com/opensearch-project/ml-commons.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - name: neural-search + repository: https://github.com/opensearch-project/neural-search.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - ml-commons + - k-NN + - name: notifications-core + repository: https://github.com/opensearch-project/notifications.git + ref: 2.x + platforms: + - linux + - windows + working_directory: notifications + depends_on: + - common-utils + - name: notifications + repository: https://github.com/opensearch-project/notifications.git + ref: 2.x + platforms: + - linux + - windows + working_directory: notifications + depends_on: + - common-utils + - name: opensearch-observability + repository: https://github.com/opensearch-project/observability.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - name: opensearch-reports + repository: https://github.com/opensearch-project/reporting.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - job-scheduler + - name: sql + repository: https://github.com/opensearch-project/sql.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - ml-commons + - name: asynchronous-search + repository: https://github.com/opensearch-project/asynchronous-search.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - name: anomaly-detection + repository: https://github.com/opensearch-project/anomaly-detection.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - job-scheduler + - name: alerting + repository: https://github.com/opensearch-project/alerting.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - name: security-analytics + repository: https://github.com/opensearch-project/security-analytics.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - name: index-management + repository: https://github.com/opensearch-project/index-management.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - job-scheduler + - name: performance-analyzer + repository: https://github.com/opensearch-project/performance-analyzer.git + ref: 2.x + platforms: + - linux + - name: custom-codecs + repository: https://github.com/opensearch-project/custom-codecs.git + ref: 2.x + platforms: + - linux + - windows + - name: flow-framework + repository: https://github.com/opensearch-project/flow-framework.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - common-utils + - name: skills + repository: https://github.com/opensearch-project/skills.git + ref: 2.x + platforms: + - linux + - windows + depends_on: + - job-scheduler + - anomaly-detection + - sql + - ml-commons diff --git a/manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml b/manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml new file mode 100644 index 0000000000..bd779fb6d2 --- /dev/null +++ b/manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml @@ -0,0 +1,89 @@ +--- +schema-version: '1.0' +name: OpenSearch Dashboards +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v4 +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 + - name: assistantDashboards + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + assistant.chat.enabled: true diff --git a/manifests/2.13.0/opensearch-dashboards-2.13.0.yml b/manifests/2.13.0/opensearch-dashboards-2.13.0.yml new file mode 100644 index 0000000000..06ddaa1fb2 --- /dev/null +++ b/manifests/2.13.0/opensearch-dashboards-2.13.0.yml @@ -0,0 +1,57 @@ +--- +schema-version: '1.1' +build: + name: OpenSearch Dashboards + version: 2.13.0 +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-build-v1 +components: + - name: OpenSearch-Dashboards + repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git + ref: 2.x + - name: functionalTestDashboards + repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git + ref: 2.x + - name: observabilityDashboards + repository: https://github.com/opensearch-project/dashboards-observability.git + ref: 2.x + - name: reportsDashboards + repository: https://github.com/opensearch-project/dashboards-reporting.git + ref: 2.x + - name: ganttChartDashboards + repository: https://github.com/opensearch-project/dashboards-visualizations.git + ref: 2.x + - name: queryWorkbenchDashboards + repository: https://github.com/opensearch-project/dashboards-query-workbench.git + ref: 2.x + - name: customImportMapDashboards + repository: https://github.com/opensearch-project/dashboards-maps.git + ref: 2.x + - name: anomalyDetectionDashboards + repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin + ref: 2.x + - name: mlCommonsDashboards + repository: https://github.com/opensearch-project/ml-commons-dashboards.git + ref: 2.x + - name: indexManagementDashboards + repository: https://github.com/opensearch-project/index-management-dashboards-plugin.git + ref: 2.x + - name: notificationsDashboards + repository: https://github.com/opensearch-project/dashboards-notifications.git + ref: 2.x + - name: alertingDashboards + repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git + ref: 2.x + - name: securityAnalyticsDashboards + repository: https://github.com/opensearch-project/security-analytics-dashboards-plugin.git + ref: 2.x + - name: securityDashboards + repository: https://github.com/opensearch-project/security-dashboards-plugin.git + ref: 2.x + - name: searchRelevanceDashboards + repository: https://github.com/opensearch-project/dashboards-search-relevance.git + ref: 2.x + - name: assistantDashboards + repository: https://github.com/opensearch-project/dashboards-assistant.git + ref: 2.x From 47d05408a94d097eabc7ceb67d4d9f0081b060b5 Mon Sep 17 00:00:00 2001 From: opensearch-ci Date: Thu, 8 Feb 2024 01:12:08 +0000 Subject: [PATCH 2/4] Update manifests Signed-off-by: opensearch-ci --- .github/workflows/os-increment-plugin-versions.yml | 1 + .github/workflows/osd-increment-plugin-versions.yml | 5 +++-- .../2.13.0/opensearch-2.13.0-concurrent-search-test.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/os-increment-plugin-versions.yml b/.github/workflows/os-increment-plugin-versions.yml index 847774f96f..2b985891a4 100644 --- a/.github/workflows/os-increment-plugin-versions.yml +++ b/.github/workflows/os-increment-plugin-versions.yml @@ -58,6 +58,7 @@ jobs: - '2.10' - '2.11' - '2.12' + - '2.13' exclude: - {entry: {repo: geospatial}, branch: '1.3'} - {entry: {repo: neural-search}, branch: '1.3'} diff --git a/.github/workflows/osd-increment-plugin-versions.yml b/.github/workflows/osd-increment-plugin-versions.yml index 53bfd1b2e6..b2af42bf23 100644 --- a/.github/workflows/osd-increment-plugin-versions.yml +++ b/.github/workflows/osd-increment-plugin-versions.yml @@ -50,6 +50,7 @@ jobs: - '2.10' - '2.11' - '2.12' + - '2.13' steps: - name: Check out OpenSearch Dashboards repo uses: actions/checkout@v3 @@ -167,8 +168,8 @@ jobs: - Incremented version to **${{ env.OSD_PLUGIN_VERSION }}**. path: 'OpenSearch-Dashboards/plugins/${{ matrix.entry.repo }}' add-paths: | - opensearch_dashboards.json - package.json + opensearch_dashboards.json + package.json - name: Check outputs run: |- echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" diff --git a/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml b/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml index 75a9dd4a02..15b3fe3675 100644 --- a/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml +++ b/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml @@ -4,7 +4,7 @@ name: OpenSearch ci: image: name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 - args: -e JAVA_HOME=/opt/java/openjdk-17 + args: -e JAVA_HOME=/opt/java/openjdk-21 components: - name: index-management integ-test: From 2d2cd2208030f7ca4007e927149d467325b634d1 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Thu, 8 Feb 2024 12:46:13 -0500 Subject: [PATCH 3/4] Address code review comments Signed-off-by: Andriy Redko --- jenkins/check-for-build.jenkinsfile | 4 +- ...ensearch-2.13.0-concurrent-search-test.yml | 210 ------------------ 2 files changed, 2 insertions(+), 212 deletions(-) delete mode 100644 manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index 714c332feb..dcf3981d46 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -25,8 +25,8 @@ pipeline { parameterizedCron ''' H 1 * * * %INPUT_MANIFEST=1.3.15/opensearch-dashboards-1.3.15.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip H 1 * * * %INPUT_MANIFEST=1.3.15/opensearch-1.3.15.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip - H */1 * * * %INPUT_MANIFEST=2.13.0/opensearch-dashboards-2.13.0.yml;TEST_MANIFEST=2.13.0/opensearch-dashboards-2.13.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip - H */1 * * * %INPUT_MANIFEST=2.13.0/opensearch-2.13.0.yml;TEST_MANIFEST=2.13.0/opensearch-2.13.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip + H */1 * * * %INPUT_MANIFEST=2.13.0/opensearch-dashboards-2.13.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip + H */1 * * * %INPUT_MANIFEST=2.13.0/opensearch-2.13.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip H */6 * * * %INPUT_MANIFEST=2.12.0/opensearch-dashboards-2.12.0.yml;TEST_MANIFEST=2.12.0/opensearch-dashboards-2.12.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip H */6 * * * %INPUT_MANIFEST=2.12.0/opensearch-2.12.0.yml;TEST_MANIFEST=2.12.0/opensearch-2.12.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip diff --git a/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml b/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml deleted file mode 100644 index 15b3fe3675..0000000000 --- a/manifests/2.13.0/opensearch-2.13.0-concurrent-search-test.yml +++ /dev/null @@ -1,210 +0,0 @@ ---- -schema-version: '1.0' -name: OpenSearch -ci: - image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 - args: -e JAVA_HOME=/opt/java/openjdk-21 -components: - - name: index-management - integ-test: - build-dependencies: - - job-scheduler - test-configs: - - with-security - - without-security - additional-cluster-configs: - path.repo: [/tmp] - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - bwc-test: - test-configs: - - with-security - - - name: anomaly-detection - integ-test: - build-dependencies: - - job-scheduler - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - bwc-test: - test-configs: - - with-security - - - name: asynchronous-search - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - 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] - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - bwc-test: - test-configs: - - with-security - - - name: notifications - working-directory: notifications - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - bwc-test: - test-configs: - - with-security - - - name: sql - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - script.context.field.max_compilations_rate: 1000/1m - plugins.query.datasources.encryption.masterkey: 4fc8fee6a3fd7d6ca01772e5 - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - bwc-test: - test-configs: - - with-security - - - name: k-NN - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: neural-search - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: opensearch-reports - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: opensearch-observability - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - bwc-test: - test-configs: - - with-security - - - name: ml-commons - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: cross-cluster-replication - integ-test: - topology: - - cluster_name: leader - data_nodes: 2 - cluster_manager_nodes: 0 - - cluster_name: follower - data_nodes: 2 - cluster_manager_nodes: 0 - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: security - integ-test: - test-configs: - - with-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: geospatial - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: security-analytics - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: custom-codecs - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 - - - name: skills - integ-test: - test-configs: - - with-security - - without-security - additional-cluster-configs: - opensearch.experimental.feature.concurrent_segment_search.enabled: true - search.concurrent_segment_search.enabled: true - search.concurrent.max_slice_count: 2 From da75b1aad49265662e9bb85a51bfd6d83f819bd4 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Thu, 8 Feb 2024 13:17:26 -0500 Subject: [PATCH 4/4] Address code review comments Signed-off-by: Andriy Redko --- jenkins/check-for-build.jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index dcf3981d46..ed2b254a37 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -25,8 +25,8 @@ pipeline { parameterizedCron ''' H 1 * * * %INPUT_MANIFEST=1.3.15/opensearch-dashboards-1.3.15.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip H 1 * * * %INPUT_MANIFEST=1.3.15/opensearch-1.3.15.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip - H */1 * * * %INPUT_MANIFEST=2.13.0/opensearch-dashboards-2.13.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip - H */1 * * * %INPUT_MANIFEST=2.13.0/opensearch-2.13.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip + H */6 * * * %INPUT_MANIFEST=2.13.0/opensearch-dashboards-2.13.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip + H */6 * * * %INPUT_MANIFEST=2.13.0/opensearch-2.13.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip H */6 * * * %INPUT_MANIFEST=2.12.0/opensearch-dashboards-2.12.0.yml;TEST_MANIFEST=2.12.0/opensearch-dashboards-2.12.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip H */6 * * * %INPUT_MANIFEST=2.12.0/opensearch-2.12.0.yml;TEST_MANIFEST=2.12.0/opensearch-2.12.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip