Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace refs with tags for 2.7.0 manifests and remove cron #3460

Merged
merged 6 commits into from
May 3, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion jenkins/check-for-build.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ pipeline {
H 1 * * * %INPUT_MANIFEST=2.8.0/opensearch-2.8.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
H 1 * * * %INPUT_MANIFEST=1.3.10/opensearch-dashboards-1.3.10.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
H 1 * * * %INPUT_MANIFEST=1.3.10/opensearch-1.3.10.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
H 1 * * * %INPUT_MANIFEST=2.6.1/opensearch-2.6.1.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
H 1 * * * %INPUT_MANIFEST=1.4.0/opensearch-1.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm zip
H 1 * * * %INPUT_MANIFEST=1.4.0/opensearch-dashboards-1.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm zip
H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TEST_MANIFEST=3.0.0/opensearch-3.0.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
Expand Down
11 changes: 1 addition & 10 deletions jenkins/opensearch/perf-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ pipeline {
H 15 * * 3 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.9/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
H 15 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.9/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0

H 21 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
H 21 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
H 21 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
H 21 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
H 21 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
H 21 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
H 21 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
H 21 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0

H 19 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.6.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove 2.6.0 as well

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We would need 1.3.9 perf for upcoming 1.3.10 release right? @bbarani

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have numbers from previous runs so should be good. Waiting on reply from @bbarani Feel free to remove 2.6.0 till then,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add 2.8.0 to the list? @zelinh

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets remove 1.3.9 and add 1.3.10.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We would have a separate PR to add 1.3.10 and remove 1.3.9 once the release cycle for 1.3.10 starts.

H 19 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.6.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
H 19 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.6.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
Expand Down Expand Up @@ -268,7 +259,7 @@ pipeline {
node(AGENT_LABEL) {
script {
def stackNames = [
"test-single-${BUILD_ID}-${ARCHITECTURE}-${BUILD_NUMBER}",
"test-single-${BUILD_ID}-${ARCHITECTURE}-${BUILD_NUMBER}",
"test-single-security-${BUILD_ID}-${ARCHITECTURE}-${BUILD_NUMBER}"
]
withCredentials([string(credentialsId: 'jenkins-aws-account-public', variable: 'AWS_ACCOUNT_PUBLIC')]) {
Expand Down
40 changes: 20 additions & 20 deletions manifests/2.7.0/opensearch-2.7.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ ci:
components:
- name: OpenSearch
repository: https://github.com/opensearch-project/OpenSearch.git
ref: b7a6e09e492b1e965d827525f7863b366ef0e304
ref: tags/2.7.0
checks:
- gradle:publish
- gradle:properties:version
- name: common-utils
repository: https://github.com/opensearch-project/common-utils.git
ref: d8fb094e13394eb3cdd420df30b28714d902658d
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -25,7 +25,7 @@ components:
- gradle:properties:version
- name: job-scheduler
repository: https://github.com/opensearch-project/job-scheduler.git
ref: e63a2e2ce9a55524bbc9eaef7c924cac7f3cbeea
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -34,7 +34,7 @@ components:
- gradle:dependencies:opensearch.version
- name: k-NN
repository: https://github.com/opensearch-project/k-NN.git
ref: 00d14d0b1b215dd1c84ad501cb6dd1cafd0d933a
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -43,7 +43,7 @@ components:
- gradle:dependencies:opensearch.version
- name: geospatial
repository: https://github.com/opensearch-project/geospatial.git
ref: 4dade96613c601344b10b8bf59a242894a421eaf
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -52,13 +52,13 @@ components:
- gradle:dependencies:opensearch.version
- name: security
repository: https://github.com/opensearch-project/security.git
ref: 54aee2d1f276181c15f4b458dbe926f33a9d0d83
ref: tags/2.7.0.0
platforms:
- linux
- windows
- name: cross-cluster-replication
repository: https://github.com/opensearch-project/cross-cluster-replication.git
ref: dd90f13b040480fc5877c39eb6d047f680abea5b
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -67,7 +67,7 @@ components:
- gradle:dependencies:opensearch.version
- name: ml-commons
repository: https://github.com/opensearch-project/ml-commons.git
ref: 3ee7b5118adf736a4acd250844e33ee988bf1032
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -76,7 +76,7 @@ components:
- gradle:dependencies:opensearch.version: opensearch-ml-plugin
- name: neural-search
repository: https://github.com/opensearch-project/neural-search.git
ref: 8b57c97a6ec777ef6fed8281929b57edd7a52d81
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -85,7 +85,7 @@ components:
- gradle:dependencies:opensearch.version
- name: notifications-core
repository: https://github.com/opensearch-project/notifications.git
ref: cd55e2611cb45d3291f4418849ec99632a675514
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -95,7 +95,7 @@ components:
- gradle:dependencies:opensearch.version: opensearch-notifications-core
- name: notifications
repository: https://github.com/opensearch-project/notifications.git
ref: cd55e2611cb45d3291f4418849ec99632a675514
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -105,7 +105,7 @@ components:
- gradle:dependencies:opensearch.version: notifications
- name: opensearch-observability
repository: https://github.com/opensearch-project/observability.git
ref: 76a2572c6aa134bc4f24d84ba2f61a16e90cbd40
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -114,7 +114,7 @@ components:
- gradle:dependencies:opensearch.version
- name: opensearch-reports
repository: https://github.com/opensearch-project/reporting
ref: 89012f28fa75eb57198dac42a519b77f8ad44beb
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -123,7 +123,7 @@ components:
- gradle:dependencies:opensearch.version
- name: sql
repository: https://github.com/opensearch-project/sql.git
ref: 0bc8628395b8443f6e1a611345901a7f2c2561fd
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -132,7 +132,7 @@ components:
- gradle:dependencies:opensearch.version: opensearch-sql-plugin
- name: asynchronous-search
repository: https://github.com/opensearch-project/asynchronous-search.git
ref: e9cb1301145f62e9ccb3dfde2bc4bfd2814170d2
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -141,7 +141,7 @@ components:
- gradle:dependencies:opensearch.version
- name: anomaly-detection
repository: https://github.com/opensearch-project/anomaly-detection.git
ref: 358546bf96bab0b5bab899ba12895b6def6cb840
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -150,7 +150,7 @@ components:
- gradle:dependencies:opensearch.version
- name: alerting
repository: https://github.com/opensearch-project/alerting.git
ref: 2292d86e569f123023922dc2bbfe5556aa8327b8
ref: tags/2.7.0.0
platforms:
- linux
- windows
Expand All @@ -159,23 +159,23 @@ components:
- gradle:dependencies:opensearch.version: alerting
- name: security-analytics
repository: https://github.com/opensearch-project/security-analytics.git
ref: 303f2024757c76ef2c2b003ce9d088476f3fd487
ref: tags/2.7.0.0
platforms:
- linux
- windows
checks:
- gradle:properties:version
- name: index-management
repository: https://github.com/opensearch-project/index-management.git
ref: 09f9d11dae76e3f8b9b8d1ed23531a7c071d146a
ref: tags/2.7.0.0
platforms:
- linux
- windows
checks:
- gradle:properties:version
- name: performance-analyzer
repository: https://github.com/opensearch-project/performance-analyzer.git
ref: d4617206bbedb5bace365e857bba8a85bfd4fc50
ref: tags/2.7.0.0
platforms:
- linux
checks:
Expand Down
30 changes: 15 additions & 15 deletions manifests/2.7.0/opensearch-dashboards-2.7.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,47 @@ ci:
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
ref: a525bcd03d123150f1de16c4046f8e4d24173fa0
ref: tags/2.7.0
- name: functionalTestDashboards
repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
ref: 7408f7075c4bfdd916c250229ce1e3292aba994b
ref: tags/2.7.0
- name: observabilityDashboards
repository: https://github.com/opensearch-project/dashboards-observability.git
ref: 88bd10260316af2457cbcb45466ac89dbba08892
ref: tags/2.7.0.0
- name: reportsDashboards
repository: https://github.com/opensearch-project/dashboards-reporting.git
ref: c080db9484b8648e7ac9d5292ad596b2a0ab4ab0
ref: tags/2.7.0.0
- name: ganttChartDashboards
repository: https://github.com/opensearch-project/dashboards-visualizations.git
working_directory: gantt-chart
ref: ef8520bf559647c27794f55b8e01248a12c772f0
ref: tags/2.7.0.0
- name: queryWorkbenchDashboards
repository: https://github.com/opensearch-project/dashboards-query-workbench.git
ref: 9c7d16b43d4429c272ab71c98174657b13de8ef5
ref: tags/2.7.0.0
- name: customImportMapDashboards
repository: https://github.com/opensearch-project/dashboards-maps.git
ref: e6bbd11eac6edb62d3ff5c4b06df60fcde05d3d3
ref: tags/2.7.0.0
- name: anomalyDetectionDashboards
repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
ref: a74f1168e94206d7a45535845fbe5d4b508abad5
ref: tags/2.7.0.0
- name: mlCommonsDashboards
repository: https://github.com/opensearch-project/ml-commons-dashboards.git
ref: 0ccb1e3d2f478c30c7c7061c89b4dadfb94c3c41
ref: tags/2.7.0.0
- name: indexManagementDashboards
repository: https://github.com/opensearch-project/index-management-dashboards-plugin.git
ref: f7318b760d7bc6615ca5b75736316d09965c3ba9
ref: tags/2.7.0.0
- name: notificationsDashboards
repository: https://github.com/opensearch-project/dashboards-notifications.git
ref: 1feab2f3aa9b73e4ea16a75af5e152700c54d33b
ref: tags/2.7.0.0
- name: alertingDashboards
repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git
ref: c718a40f5e49cac3c07a891473dd1ab9fd5c23cd
ref: tags/2.7.0.0
- name: securityAnalyticsDashboards
repository: https://github.com/opensearch-project/security-analytics-dashboards-plugin.git
ref: 80465d7916af689be5db5e9fa97ed6449053f0e2
ref: tags/2.7.0.0
- name: securityDashboards
repository: https://github.com/opensearch-project/security-dashboards-plugin.git
ref: fb7426e5b0ca2b1229026805d29b74730ca9bacf
ref: tags/2.7.0.0
- name: searchRelevanceDashboards
repository: https://github.com/opensearch-project/dashboards-search-relevance.git
ref: 2404a9326360c303915427107007c04d96a4a1af
ref: tags/2.7.0.0