[Build][Test] OS and OSD improvements plus support for Playground #1756
+366
−97
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,8 @@ pipeline { | |
| agent none | ||
| environment { | ||
| AGENT_X64 = 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' | ||
| AGENT_ARM64 = 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' | ||
| DEFAULT_INTEG_TEST_JOB_NAME = 'integ-test-opensearch-dashboards' | ||
| } | ||
| parameters { | ||
| string( | ||
|
|
@@ -23,8 +23,33 @@ pipeline { | |
| description: 'Test manifest under the manifests folder, e.g. 2.0.0/opensearch-dashboards-2.0.0-test.yml.', | ||
| trim: true | ||
| ) | ||
| string( | ||
| name: 'INTEG_TEST_JOB_NAME', | ||
| description: "Name of integration test job that will be triggered, e.g. Playground/integ-test-opensearch-dashboards.", | ||
| defaultValue: "integ-test-opensearch-dashboards", | ||
| trim: true | ||
| ) | ||
| booleanParam( | ||
| name: 'BUILD_DOCKER', | ||
| description: 'Build docker image or not.', | ||
| defaultValue: true | ||
| ) | ||
| booleanParam( | ||
| name: 'PUBLISH_NOTIFICATION', | ||
| description: 'Publish the status of this build job or not.', | ||
| defaultValue: true | ||
| ) | ||
| } | ||
| stages { | ||
| stage('verify-parameters') { | ||
| steps { | ||
| script { | ||
| env.INTEG_TEST_JOB_NAME = INTEG_TEST_JOB_NAME != '' ? | ||
| INTEG_TEST_JOB_NAME : | ||
| DEFAULT_INTEG_TEST_JOB_NAME | ||
| } | ||
| } | ||
| } | ||
| stage('detect docker image + args') { | ||
| agent { | ||
| docker { | ||
|
|
@@ -65,22 +90,19 @@ pipeline { | |
| echo "artifactUrl (x64): ${artifactUrl}" | ||
|
|
||
| def integTestResults = | ||
| build job: env.INTEG_TEST_JOB_NAME, | ||
|
There was a problem hiding this comment. I think according to @abhinavGupta16, use There was a problem hiding this comment. Here I wanted to ensure the right variable is used. If we go the route not worrying about the empty string case (which would require someone manually triggering the build and clearing it) then I will remove the |
||
| propagate: false, | ||
| wait: true, | ||
| parameters: [ | ||
| string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), | ||
| string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), | ||
| string(name: 'AGENT_LABEL', value: AGENT_X64) | ||
| ] | ||
|
|
||
| createTestResultsMessage( | ||
| testType: "Integ Tests (x64)", | ||
| status: integTestResults.getResult(), | ||
| absoluteUrl: integTestResults.getAbsoluteUrl() | ||
| ) | ||
| } | ||
| } | ||
|
|
@@ -141,22 +163,19 @@ pipeline { | |
| echo "artifactUrl (arm64): ${artifactUrl}" | ||
|
|
||
| def integTestResults = | ||
| build job: env.INTEG_TEST_JOB_NAME, | ||
| propagate: false, | ||
| wait: true, | ||
| parameters: [ | ||
| string(name: 'TEST_MANIFEST', value: TEST_MANIFEST), | ||
| string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl), | ||
| string(name: 'AGENT_LABEL', value: AGENT_ARM64) | ||
| ] | ||
|
|
||
| createTestResultsMessage( | ||
| testType: "Integ Tests (arm64)", | ||
| status: integTestResults.getResult(), | ||
| absoluteUrl: integTestResults.getAbsoluteUrl() | ||
| ) | ||
| } | ||
| } | ||
|
|
@@ -171,6 +190,10 @@ pipeline { | |
| } | ||
| } | ||
| stage('docker build') { | ||
| when { | ||
| beforeAgent true | ||
| equals expected: true, actual: BUILD_DOCKER | ||
| } | ||
| steps { | ||
| node(AGENT_X64) { | ||
| script { | ||
|
|
@@ -191,19 +214,20 @@ pipeline { | |
| success { | ||
| node(AGENT_X64) { | ||
| script { | ||
| if (params.PUBLISH_NOTIFICATION) { | ||
| def stashed = lib.jenkins.Messages.new(this).get([ | ||
| 'build-and-test-linux-x64', | ||
| 'assemble-archive-and-test-linux-arm64' | ||
| ]) | ||
|
|
||
| publishNotification( | ||
| icon: ':white_check_mark:', | ||
| message: 'Successful Build', | ||
| extra: stashed, | ||
| credentialsId: 'BUILD_NOTICE_WEBHOOK', | ||
| manifest: "${INPUT_MANIFEST}" | ||
| ) | ||
| } | ||
|
|
||
| postCleanup() | ||
| } | ||
|
|
@@ -212,12 +236,14 @@ pipeline { | |
| failure { | ||
| node(AGENT_X64) { | ||
| script { | ||
| if (params.PUBLISH_NOTIFICATION) { | ||
| publishNotification( | ||
| icon: ':warning:', | ||
| message: 'Failed Build', | ||
| credentialsId: 'BUILD_NOTICE_WEBHOOK', | ||
| manifest: "${INPUT_MANIFEST}" | ||
| ) | ||
| } | ||
|
|
||
| postCleanup() | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need the check here since
INTEG_TEST_JOB_NAMEalways has the default value which is the same as theDEFAULT_INTEG_TEST_JOB_NAMEif not assigned?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is probably me being too protective but technically someone can kick off a build and empty out the string for
INTEG_TEST_JOB_NAME. I can remove this if we do not want to handle those situations.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Had some offline discussion with @kavilla, this makes sense to me that we could leave the parameter empty with this stage of check. These situation could happen for example when we pass the params from cron jobs. This shouldn't be a blocker for me.