Skip to content

Commit

Permalink
Restore gradle check on windows agents and disable 2.7.1/2.8.0 builds…
Browse files Browse the repository at this point in the history
… and lock commitids (#3579)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
  • Loading branch information
peterzhuamazon authored Jun 1, 2023
1 parent 55552ae commit a70172d
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 43 deletions.
16 changes: 8 additions & 8 deletions jenkins/gradle/gradle-check.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ pipeline {
printContributedVariables: false,
printPostContent: false
)
//parameterizedCron '''
// H 1 * * * %GIT_REFERENCE=main;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
// H 4 * * * %GIT_REFERENCE=main;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
// H 9 * * * %GIT_REFERENCE=1.x;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
// H 12 * * * %GIT_REFERENCE=1.x;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
// H 17 * * * %GIT_REFERENCE=2.x;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
// H 20 * * * %GIT_REFERENCE=2.x;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
//'''
parameterizedCron '''
H 1 * * * %GIT_REFERENCE=main;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
H 4 * * * %GIT_REFERENCE=main;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
H 9 * * * %GIT_REFERENCE=1.x;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
H 12 * * * %GIT_REFERENCE=1.x;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
H 17 * * * %GIT_REFERENCE=2.x;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
H 20 * * * %GIT_REFERENCE=2.x;AGENT_LABEL=Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host
'''
}
environment {
BUILD_CAUSE = currentBuild.getBuildCauses()
Expand Down
40 changes: 20 additions & 20 deletions manifests/2.8.0/opensearch-2.8.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: '2.8'
ref: 9e5231c5c3937befe54e0106a5477bd3d08f8ef3
checks:
- gradle:publish
- gradle:properties:version
- name: common-utils
repository: /~https://github.com/opensearch-project/common-utils.git
ref: '2.8'
ref: f435dbca179c459b74df2bd19cb4b46f0e8cd8c5
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: '2.8'
ref: c6cd7b369651ea45930449d01dc2c65b4f5f557e
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: '2.8'
ref: f11f1f1d4ad0de76b05517b57bcc87e0a6788031
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: '2.8'
ref: 44ff69db3e98170117b4237bffeb35e1580189ec
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: '2.8'
ref: 60f392d6e0dccb0aadef23a235291ef0f10f4f36
platforms:
- linux
- windows
- name: cross-cluster-replication
repository: /~https://github.com/opensearch-project/cross-cluster-replication.git
ref: '2.8'
ref: 261d7abb361958e37a378dd387543f49c5c98b51
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: '2.8'
ref: b152ad3ecfaf4b684be21ba1c09e5fec64572b42
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: '2.8'
ref: 3e6aa00d667ddc8490cc8dcbb31c61d962188d83
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: '2.8'
ref: 6613fce3e68048ca96b1b79b2e59a32d4268a921
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: '2.8'
ref: 6613fce3e68048ca96b1b79b2e59a32d4268a921
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: '2.8'
ref: 0ea64d81430af9a75c3e2519f84e6d10bb91c515
platforms:
- linux
- windows
Expand All @@ -114,7 +114,7 @@ components:
- gradle:dependencies:opensearch.version
- name: opensearch-reports
repository: /~https://github.com/opensearch-project/reporting.git
ref: '2.8'
ref: d7ff8cd6b6c97012c53de718835a2fd4985479bf
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: '2.8'
ref: 8ea39ef9edc572cf36a6ce2d51f83f789e13a22b
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: '2.8'
ref: b255fa2d7d682f75edb161c4857d90148c3d29d3
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: '2.8'
ref: 297ca1e2e427f3d710a6887d6397451ae2ec695e
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: '2.8'
ref: 3c2d5a6351fc96568ca60b7609685fdc9276f5a0
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: '2.8'
ref: d9cd0a0698ad51c0074a69689010407dc97a3fce
platforms:
- linux
- windows
checks:
- gradle:properties:version
- name: index-management
repository: /~https://github.com/opensearch-project/index-management.git
ref: '2.8'
ref: 5c420129ee8e6f8921a2248590f79e0e35b85730
platforms:
- linux
- windows
checks:
- gradle:properties:version
- name: performance-analyzer
repository: /~https://github.com/opensearch-project/performance-analyzer.git
ref: '2.8'
ref: 89eeaa4ff83e6560fc8c136c0460233b5b0b4330
platforms:
- linux
checks:
Expand Down
30 changes: 15 additions & 15 deletions manifests/2.8.0/opensearch-dashboards-2.8.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: '2.8'
ref: 23b174303ef8d8b2f552cd573db10ef6ab2ae3f5
- name: functionalTestDashboards
repository: /~https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
ref: '2.8'
ref: 35b0c7e88c21210f2402ce39f992b4a3ba0a514f
- name: observabilityDashboards
repository: /~https://github.com/opensearch-project/dashboards-observability.git
ref: '2.8'
ref: 4f8484a7f4cd436db1c5f0f82ee20f817b5433dd
- name: reportsDashboards
repository: /~https://github.com/opensearch-project/dashboards-reporting.git
ref: '2.8'
ref: 75205dba4bc1668f6706e40efbfcd7cd875676ae
- name: ganttChartDashboards
repository: /~https://github.com/opensearch-project/dashboards-visualizations.git
working_directory: gantt-chart
ref: '2.8'
ref: c1f2dbf660d62a6b742c89927a3e8af6ad5f1eda
- name: queryWorkbenchDashboards
repository: /~https://github.com/opensearch-project/dashboards-query-workbench.git
ref: '2.8'
ref: a3c8b8791ca53165f7d798cf3c1835a487369c48
- name: customImportMapDashboards
repository: /~https://github.com/opensearch-project/dashboards-maps.git
ref: '2.8'
ref: 0d976e7a8da11282a600e5e9780f464dab70475c
- name: anomalyDetectionDashboards
repository: /~https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
ref: '2.8'
ref: 56ee83042d77b61ee600f6df7675445c10e3c964
- name: mlCommonsDashboards
repository: /~https://github.com/opensearch-project/ml-commons-dashboards.git
ref: '2.8'
ref: 95ce3543148b6cb5d1be9d70d6b787539feda6be
- name: indexManagementDashboards
repository: /~https://github.com/opensearch-project/index-management-dashboards-plugin.git
ref: '2.8'
ref: c9294e604884eb742a5b891562a8add212d86d70
- name: notificationsDashboards
repository: /~https://github.com/opensearch-project/dashboards-notifications.git
ref: '2.8'
ref: d369cfb77cf31a5007f81192717140ee7717ce6f
- name: alertingDashboards
repository: /~https://github.com/opensearch-project/alerting-dashboards-plugin.git
ref: '2.8'
ref: 9af360d7d68443068eb1f5a4a834504b51487b9b
- name: securityAnalyticsDashboards
repository: /~https://github.com/opensearch-project/security-analytics-dashboards-plugin.git
ref: '2.8'
ref: 47b2a21e9c25397a905200225e7ef6f5caadb827
- name: securityDashboards
repository: /~https://github.com/opensearch-project/security-dashboards-plugin.git
ref: '2.8'
ref: ae083f97337dbe865d10e7d11897d2ab5c2f8afc
- name: searchRelevanceDashboards
repository: /~https://github.com/opensearch-project/dashboards-search-relevance.git
ref: '2.8'
ref: 88bba5faed5f8a6e49b68cd9f403121e8fd87bb6

0 comments on commit a70172d

Please sign in to comment.