Skip to content

Commit f318149

Browse files
peterzhuamazonpeterzhuamazon
authored
Tweak promotion pipeline to support rpm and qualifier (opensearch-project#2094)
* Tweak promotion pipeline to support rpm and qualifier Signed-off-by: Peter Zhu <[email protected]> * Add qualifier tests Signed-off-by: Peter Zhu <[email protected]> * Add signer tests Signed-off-by: Peter Zhu <[email protected]> * Update core plugins path after Sarat PR merged opensearch-project/OpenSearch#3193 Signed-off-by: Peter Zhu <[email protected]> * Remove extra comments Signed-off-by: Peter Zhu <[email protected]> * Rename promoteTarArtifacts promoteArtifacts Signed-off-by: Peter Zhu <[email protected]>
1 parent f3b52c4 commit f318149

File tree

41 files changed

+6009
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+6009
-249
lines changed

‎jenkins/check-for-build.jenkinsfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm))
22

33
pipeline {
44
options {
5+
timeout(time: 1, unit: 'HOURS')
56
buildDiscarder(logRotator(daysToKeepStr: '7'))
67
}
78
agent none

‎jenkins/opensearch-dashboards/distribution-build.jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
22

33
pipeline {
44
options {
5-
timeout(time: 3, unit: 'HOURS')
5+
timeout(time: 4, unit: 'HOURS')
66
copyArtifactPermission("${JOB_BASE_NAME}")
77
buildDiscarder(logRotator(artifactNumToKeepStr: '1'))
88
}

‎jenkins/opensearch/distribution-build.jenkinsfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm))
22

33
pipeline {
4+
options {
5+
timeout(time: 4, unit: 'HOURS')
6+
}
47
agent none
58
environment {
69
AGENT_X64 = 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host'

‎jenkins/promotion/tar-promotion.jenkinsfile‎ renamed to ‎jenkins/promotion/promotion.jenkinsfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ pipeline {
4545
}
4646
steps {
4747
script {
48-
promoteTarArtifacts(
48+
currentBuild.description = "${DISTRIBUTION_BUILD_NUMBER} ${DISTRIBUTION_PLATFORM} ${DISTRIBUTION_ARCHITECTURE} ${INPUT_MANIFEST}"
49+
promoteArtifacts(
4950
fileActions: [createSha512Checksums(), createSignatureFiles()]
5051
)
5152
}

‎src/sign_workflow/signer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
class Signer:
21-
ACCEPTED_FILE_TYPES = [".zip", ".jar", ".war", ".pom", ".module", ".tar.gz", ".whl", ".crate"]
21+
ACCEPTED_FILE_TYPES = [".zip", ".jar", ".war", ".pom", ".module", ".tar.gz", ".whl", ".crate", ".rpm"]
2222

2323
def __init__(self):
2424
self.git_repo = GitRepository(self.get_repo_url(), "HEAD", working_subdirectory="src")

‎tests/data/opensearch-build-1.3.0-rpm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ build:
99
components:
1010
- artifacts:
1111
dist:
12-
- dist/opensearch-min-1.3.0-linux-x64.tar.gz
12+
- dist/opensearch-min-1.3.0-linux-x64.rpm
1313
core-plugins:
1414
- core-plugins/discovery-ec2-1.3.0.zip
1515
- core-plugins/transport-nio-1.3.0.zip

‎tests/data/opensearch-build-2.0.0-rc1-rpm.yml‎

Lines changed: 2486 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/data/opensearch-build-2.0.0-rc1.yml‎

Lines changed: 2486 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/data/opensearch-dashboards-build-1.3.0-rpm.yml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
---
2+
build:
3+
architecture: x64
4+
id: 25b38c278cdd45efa583765d8ba76346
5+
name: OpenSearch Dashboards
6+
platform: linux
7+
version: 1.3.0
8+
distribution: rpm
9+
components:
10+
- artifacts:
11+
dist:
12+
- dist/opensearch-dashboards-min-1.3.0-linux-x64.rpm
13+
commit_id: caf668e73304bac890f41c37cd6c3a41257cd289
14+
name: OpenSearch-Dashboards
15+
ref: tags/1.3.0
16+
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
17+
version: 1.3.0.0
18+
- artifacts:
19+
plugins:
20+
- plugins/alertingDashboards-1.3.0.zip
21+
commit_id: 07d4cb8bc9c62b15bf7cb4fd4e3fc3a818f9152d
22+
name: alertingDashboards
23+
ref: tags/1.3.0.0
24+
repository: https://github.com/opensearch-project/alerting-dashboards-plugin
25+
version: 1.3.0.0
26+
- commit_id: 208227256bf6dece2976da528bf41bae56e4effc
27+
name: functionalTestDashboards
28+
ref: main
29+
repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
30+
version: 1.3.0.0
31+
- artifacts:
32+
plugins:
33+
- plugins/securityDashboards-1.3.0.zip
34+
commit_id: 960ef753f74dceb793e8936a40ac8c6cbec88dd1
35+
name: securityDashboards
36+
ref: '1.3'
37+
repository: https://github.com/opensearch-project/security-dashboards-plugin.git
38+
version: 1.3.0.0
39+
- artifacts:
40+
plugins:
41+
- plugins/indexManagementDashboards-1.3.0.zip
42+
commit_id: 6748b18ee172138b4811a459053f4a43c1486821
43+
name: indexManagementDashboards
44+
ref: '1.3'
45+
repository: https://github.com/opensearch-project/index-management-dashboards-plugin
46+
version: 1.3.0.0
47+
- artifacts:
48+
plugins:
49+
- plugins/queryWorkbenchDashboards-1.3.0.zip
50+
commit_id: a675eac2ed32a228184c47c289cfd22fde479139
51+
name: queryWorkbenchDashboards
52+
ref: 1.3.0.0
53+
repository: https://github.com/opensearch-project/sql.git
54+
version: 1.3.0.0
55+
- artifacts:
56+
plugins:
57+
- plugins/reportsDashboards-1.3.0.zip
58+
commit_id: 290523a6d825c9c073818aebfcbe4813cb2554bc
59+
name: reportsDashboards
60+
ref: 1.3.0.0
61+
repository: https://github.com/opensearch-project/dashboards-reports.git
62+
version: 1.3.0.0
63+
- artifacts:
64+
plugins:
65+
- plugins/observabilityDashboards-1.3.0.zip
66+
commit_id: 4fde4040c0a43233b41a862a169e2bd1616f6b1b
67+
name: observabilityDashboards
68+
ref: 1.3.0.0
69+
repository: https://github.com/opensearch-project/trace-analytics.git
70+
version: 1.3.0.0
71+
- artifacts:
72+
plugins:
73+
- plugins/ganttChartDashboards-1.3.0.zip
74+
commit_id: 2123bc65873e026cb8b0fd26816a6b1980bd19ce
75+
name: ganttChartDashboards
76+
ref: 1.3.0.0
77+
repository: https://github.com/opensearch-project/dashboards-visualizations.git
78+
version: 1.3.0.0
79+
- artifacts:
80+
plugins:
81+
- plugins/anomalyDetectionDashboards-1.3.0.zip
82+
commit_id: c4921f4471aeab38db80eb47cd92b4f7a3e04126
83+
name: anomalyDetectionDashboards
84+
ref: tags/1.3.0.0
85+
repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
86+
version: 1.3.0.0
87+
schema-version: '1.2'

‎tests/data/opensearch-dashboards-build-1.3.0.yml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
---
2+
build:
3+
architecture: x64
4+
id: 25b38c278cdd45efa583765d8ba76346
5+
name: OpenSearch Dashboards
6+
platform: linux
7+
version: 1.3.0
8+
distribution: tar
9+
components:
10+
- artifacts:
11+
dist:
12+
- dist/opensearch-dashboards-min-1.3.0-linux-x64.tar.gz
13+
commit_id: caf668e73304bac890f41c37cd6c3a41257cd289
14+
name: OpenSearch-Dashboards
15+
ref: tags/1.3.0
16+
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
17+
version: 1.3.0.0
18+
- artifacts:
19+
plugins:
20+
- plugins/alertingDashboards-1.3.0.zip
21+
commit_id: 07d4cb8bc9c62b15bf7cb4fd4e3fc3a818f9152d
22+
name: alertingDashboards
23+
ref: tags/1.3.0.0
24+
repository: https://github.com/opensearch-project/alerting-dashboards-plugin
25+
version: 1.3.0.0
26+
- commit_id: 208227256bf6dece2976da528bf41bae56e4effc
27+
name: functionalTestDashboards
28+
ref: main
29+
repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
30+
version: 1.3.0.0
31+
- artifacts:
32+
plugins:
33+
- plugins/securityDashboards-1.3.0.zip
34+
commit_id: 960ef753f74dceb793e8936a40ac8c6cbec88dd1
35+
name: securityDashboards
36+
ref: '1.3'
37+
repository: https://github.com/opensearch-project/security-dashboards-plugin.git
38+
version: 1.3.0.0
39+
- artifacts:
40+
plugins:
41+
- plugins/indexManagementDashboards-1.3.0.zip
42+
commit_id: 6748b18ee172138b4811a459053f4a43c1486821
43+
name: indexManagementDashboards
44+
ref: '1.3'
45+
repository: https://github.com/opensearch-project/index-management-dashboards-plugin
46+
version: 1.3.0.0
47+
- artifacts:
48+
plugins:
49+
- plugins/queryWorkbenchDashboards-1.3.0.zip
50+
commit_id: a675eac2ed32a228184c47c289cfd22fde479139
51+
name: queryWorkbenchDashboards
52+
ref: 1.3.0.0
53+
repository: https://github.com/opensearch-project/sql.git
54+
version: 1.3.0.0
55+
- artifacts:
56+
plugins:
57+
- plugins/reportsDashboards-1.3.0.zip
58+
commit_id: 290523a6d825c9c073818aebfcbe4813cb2554bc
59+
name: reportsDashboards
60+
ref: 1.3.0.0
61+
repository: https://github.com/opensearch-project/dashboards-reports.git
62+
version: 1.3.0.0
63+
- artifacts:
64+
plugins:
65+
- plugins/observabilityDashboards-1.3.0.zip
66+
commit_id: 4fde4040c0a43233b41a862a169e2bd1616f6b1b
67+
name: observabilityDashboards
68+
ref: 1.3.0.0
69+
repository: https://github.com/opensearch-project/trace-analytics.git
70+
version: 1.3.0.0
71+
- artifacts:
72+
plugins:
73+
- plugins/ganttChartDashboards-1.3.0.zip
74+
commit_id: 2123bc65873e026cb8b0fd26816a6b1980bd19ce
75+
name: ganttChartDashboards
76+
ref: 1.3.0.0
77+
repository: https://github.com/opensearch-project/dashboards-visualizations.git
78+
version: 1.3.0.0
79+
- artifacts:
80+
plugins:
81+
- plugins/anomalyDetectionDashboards-1.3.0.zip
82+
commit_id: c4921f4471aeab38db80eb47cd92b4f7a3e04126
83+
name: anomalyDetectionDashboards
84+
ref: tags/1.3.0.0
85+
repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
86+
version: 1.3.0.0
87+
schema-version: '1.2'

0 commit comments

Comments
 (0)