Skip to content

Commit 63560eb

Browse files
Merge branch 'main' into update-beta1-manifest
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
2 parents ff1b85c + 60ca9ed commit 63560eb

11 files changed

+1235
-70
lines changed

jenkins/check-for-build.jenkinsfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pipeline {
2323
}
2424
triggers {
2525
parameterizedCron '''
26+
H 1 * * * %INPUT_MANIFEST=2.19.2/opensearch-2.19.2.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
2627
H 6 * * * %INPUT_MANIFEST=3.0.0-beta1/opensearch-3.0.0-beta1.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip;UPDATE_GITHUB_ISSUE=false
2728
H 6 * * * %INPUT_MANIFEST=3.0.0-beta1/opensearch-dashboards-3.0.0-beta1.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip;UPDATE_GITHUB_ISSUE=false
2829
'''

jenkins/opensearch/benchmark-test.jenkinsfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ pipeline {
7070
H 3 * * * %DISTRIBUTION_URL=https://artifacts.opensearch.org/releases/bundle/opensearch/2.19.1/opensearch-2.19.1-linux-x64.tar.gz;DISTRIBUTION_VERSION=2.19.1;TEST_WORKLOAD=noaa;SINGLE_NODE_CLUSTER=true;DATA_INSTANCE_TYPE=c5.2xlarge;DATA_NODE_STORAGE=200;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.2xlarge,major-version:2x,cluster-config:x64-c5.2xlarge-1-shard-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"0","number_of_shards":"1"}
7171
H 3 * * * %DISTRIBUTION_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0-alpha1/latest/linux/x64/tar/dist/opensearch/opensearch-3.0.0-alpha1-linux-x64.tar.gz;DISTRIBUTION_VERSION=3.0.0-alpha1;TEST_WORKLOAD=noaa;SINGLE_NODE_CLUSTER=true;DATA_INSTANCE_TYPE=c5.2xlarge;DATA_NODE_STORAGE=200;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.2xlarge,major-version:3x,cluster-config:x64-c5.2xlarge-1-shard-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"0","number_of_shards":"1"}
7272

73-
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:c6g.2xlarge,major-version:2x,cluster-config:arm64-c6g.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-218","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-218","snapshot_name":"http_logs_3_shards"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c6g.2xlarge
74-
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=nyc_taxis;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:c6g.2xlarge,major-version:2x,cluster-config:arm64-c6g.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-218","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-218","snapshot_name":"nyc_taxis_3_shards"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c6g.2xlarge
75-
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.2xlarge,major-version:2x,cluster-config:x64-c5.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-218","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-218","snapshot_name":"http_logs_3_shards"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c5.2xlarge
76-
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=nyc_taxis;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.2xlarge,major-version:2x,cluster-config:x64-c5.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-218","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-218","snapshot_name":"nyc_taxis_3_shards"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c5.2xlarge
77-
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:c6g.2xlarge,major-version:2x,cluster-config:arm64-c6g.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-218","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-218","snapshot_name":"big5_3_shards_single_client"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c6g.2xlarge
78-
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.2xlarge,major-version:2x,cluster-config:x64-c5.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-218","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-218","snapshot_name":"big5_3_shards_single_client"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c5.2xlarge
73+
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:c6g.2xlarge,major-version:2x,cluster-config:arm64-c6g.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-219","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-219","snapshot_name":"http_logs_3_shards"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c6g.2xlarge
74+
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=nyc_taxis;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:c6g.2xlarge,major-version:2x,cluster-config:arm64-c6g.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-219","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-219","snapshot_name":"nyc_taxis_3_shards"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c6g.2xlarge
75+
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.2xlarge,major-version:2x,cluster-config:x64-c5.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-219","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-219","snapshot_name":"http_logs_3_shards"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c5.2xlarge
76+
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=nyc_taxis;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.2xlarge,major-version:2x,cluster-config:x64-c5.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-219","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-219","snapshot_name":"nyc_taxis_3_shards"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c5.2xlarge
77+
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:c6g.2xlarge,major-version:2x,cluster-config:arm64-c6g.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-219","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-219","snapshot_name":"big5_3_shards_single_client"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c6g.2xlarge
78+
H 4 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:c5.2xlarge,major-version:2x,cluster-config:x64-c5.2xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo-219","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots-219","snapshot_name":"big5_3_shards_single_client"};TEST_PROCEDURE=restore-from-snapshot;DATA_INSTANCE_TYPE=c5.2xlarge
7979

8080

8181
H 5 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.19.1/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=vectorsearch;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.2xlarge,major-version:2x,cluster-config:arm64-r6g.2xlarge-3-data-3-shards-1-replica-nmslib-cohere-1m;ADDITIONAL_CONFIG=knn.algo_param.index_thread_qty:2;WORKLOAD_PARAMS={"target_index_name":"target_index","target_field_name":"target_field","target_index_body":"indices/nmslib-index.json","target_index_primary_shards":3,"target_index_dimension":768,"target_index_space_type":"innerproduct","target_index_bulk_size":100,"target_index_bulk_index_data_set_format":"hdf5","target_index_bulk_index_data_set_corpus":"cohere-1m","target_index_bulk_indexing_clients":10,"target_index_max_num_segments":1,"hnsw_ef_search":256,"hnsw_ef_construction":256,"query_k":100,"query_body":{"docvalue_fields":["_id"],"stored_fields":"_none_"},"query_data_set_format":"hdf5","query_data_set_corpus":"cohere-1m","neighbors_data_set_corpus":"cohere-1m","neighbors_data_set_format":"hdf5","query_count":10000}

jenkins/release-workflows/promote-repos.jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* compatible open source license.
88
*/
99

10-
lib = library(identifier: 'jenkins@6.4.7', retriever: modernSCM([
10+
lib = library(identifier: 'jenkins@8.3.4', retriever: modernSCM([
1111
$class: 'GitSCMSource',
1212
remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
1313
]))
+172
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
---
2+
schema-version: '1.0'
3+
name: OpenSearch
4+
ci:
5+
image:
6+
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
7+
args: -e JAVA_HOME=/opt/java/openjdk-21
8+
components:
9+
- name: OpenSearch
10+
smoke-test:
11+
test-spec: opensearch.yml
12+
- name: alerting
13+
integ-test:
14+
test-configs:
15+
- with-security
16+
- without-security
17+
additional-cluster-configs:
18+
plugins.destination.host.deny_list:
19+
- 10.0.0.0/8
20+
- 127.0.0.1
21+
bwc-test:
22+
test-configs:
23+
- with-security
24+
- name: anomaly-detection
25+
integ-test:
26+
build-dependencies:
27+
- job-scheduler
28+
test-configs:
29+
- with-security
30+
- without-security
31+
bwc-test:
32+
test-configs:
33+
- with-security
34+
- name: flow-framework
35+
integ-test:
36+
test-configs:
37+
- with-security
38+
- without-security
39+
- name: asynchronous-search
40+
integ-test:
41+
test-configs:
42+
- with-security
43+
- without-security
44+
bwc-test:
45+
test-configs:
46+
- with-security
47+
- name: cross-cluster-replication
48+
integ-test:
49+
topology:
50+
- cluster_name: leader
51+
data_nodes: 2
52+
- cluster_name: follower
53+
data_nodes: 2
54+
test-configs:
55+
- with-security
56+
- without-security
57+
- name: geospatial
58+
integ-test:
59+
test-configs:
60+
- with-security
61+
- without-security
62+
- name: index-management
63+
integ-test:
64+
build-dependencies:
65+
- job-scheduler
66+
test-configs:
67+
- with-security
68+
- without-security
69+
additional-cluster-configs:
70+
path.repo:
71+
- /tmp
72+
bwc-test:
73+
test-configs:
74+
- with-security
75+
smoke-test:
76+
test-spec: index-management.yml
77+
- name: k-NN
78+
integ-test:
79+
test-configs:
80+
- with-security
81+
- without-security
82+
additional-cluster-configs:
83+
node.attr.knn_cb_tier: integ
84+
path.repo:
85+
- /tmp
86+
- C:\
87+
smoke-test:
88+
test-spec: k-NN.yml
89+
- name: ml-commons
90+
integ-test:
91+
test-configs:
92+
- with-security
93+
- without-security
94+
- name: opensearch-learning-to-rank-base
95+
integ-test:
96+
test-configs:
97+
- with-security
98+
- without-security
99+
- name: neural-search
100+
integ-test:
101+
test-configs:
102+
- with-security
103+
- without-security
104+
- name: notifications
105+
working-directory: notifications
106+
integ-test:
107+
test-configs:
108+
- with-security
109+
- without-security
110+
bwc-test:
111+
test-configs:
112+
- with-security
113+
- name: opensearch-observability
114+
integ-test:
115+
test-configs:
116+
- with-security
117+
- without-security
118+
bwc-test:
119+
test-configs:
120+
- with-security
121+
- name: opensearch-reports
122+
integ-test:
123+
test-configs:
124+
- with-security
125+
- without-security
126+
- name: security
127+
integ-test:
128+
test-configs:
129+
- with-security
130+
smoke-test:
131+
test-spec: security.yml
132+
- name: security-analytics
133+
integ-test:
134+
test-configs:
135+
- with-security
136+
- without-security
137+
- name: sql
138+
integ-test:
139+
test-configs:
140+
- with-security
141+
- without-security
142+
additional-cluster-configs:
143+
script.context.field.max_compilations_rate: 1000/1m
144+
plugins.query.datasources.encryption.masterkey: 4fc8fee6a3fd7d6ca01772e5
145+
bwc-test:
146+
test-configs:
147+
- with-security
148+
smoke-test:
149+
test-spec: sql.yml
150+
- name: custom-codecs
151+
integ-test:
152+
test-configs:
153+
- with-security
154+
- without-security
155+
- name: skills
156+
integ-test:
157+
test-configs:
158+
- with-security
159+
- without-security
160+
- name: query-insights
161+
integ-test:
162+
test-configs:
163+
- with-security
164+
- without-security
165+
- name: opensearch-system-templates
166+
integ-test:
167+
test-configs:
168+
- with-security
169+
- without-security
170+
additional-cluster-configs:
171+
opensearch.experimental.feature.application_templates.enabled: true
172+
cluster.application_templates.enabled: true

0 commit comments

Comments
 (0)