diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index 80bc94732e..700f7c7ac1 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -116,8 +116,6 @@ pipeline { env.artifactPath = buildManifestObj.getArtifactRoot(BUILD_JOB_NAME, buildId) env.artifactPathOpenSearch = buildManifestObjOpenSearch.getArtifactRoot(BUILD_JOB_NAME_OPENSEARCH, buildIdOpenSearch) env.AGENT_LABEL = agent_nodes["${env.platform}_${architecture}"] - env.updateGithubIssues = (params.UPDATE_GITHUB_ISSUES && (env.distribution == 'tar')) - echo "GitHub issue update is set to : ${env.updateGithubIssues.toBoolean()}" echo "Version: ${version}, VersionOpenSearch: ${versionOpenSearch}, Agent: ${AGENT_LABEL}, OSD_BuildId: ${buildId}, OS_BuildId: ${buildIdOpenSearch}, Distribution: ${distribution}" currentBuild.description = "$architecture, $platform, osd-$version-$buildId, os-$versionOpenSearch-$buildIdOpenSearch, $distribution" @@ -256,7 +254,7 @@ pipeline { localPath: "${WORKSPACE}/${distribution}", switchUserNonRoot: "${switch_user_non_root}" ) - if (env.updateGithubIssues.toBoolean()) { + if (params.UPDATE_GITHUB_ISSUES) { updateGitHubIssueLabels( repoUrl: buildManifestObj.getRepo("${local_component}"), issueTitle: "[AUTOCUT] Integration Test failed for ${local_component}: ${version}", @@ -268,7 +266,7 @@ pipeline { } catch (e) { echo "Error running integtest for component ${local_component}, creating Github issue" String issueBodyMessage = "The integration test failed at distribution level for component ${local_component}
Version: ${version}
Distribution: ${distribution}
Architecture: ${architecture}
Platform: ${platform}

Please check the logs: ${RUN_DISPLAY_URL}

* Test-report manifest:*
- https://ci.opensearch.org/ci/dbc/${JOB_NAME}/${version}/${buildId}/${platform}/${architecture}/${distribution}/test-results/${BUILD_NUMBER}/integ-test/test-report.yml

_Note: Steps to reproduce, additional logs and other files can be found within the above test-report manifest.
Instructions of this test-report manifest can be found [here](https://github.com/opensearch-project/opensearch-build/tree/main/src/report_workflow#guide-on-test-report-manifest-from-ci)._" - if (env.updateGithubIssues.toBoolean()) { + if (params.UPDATE_GITHUB_ISSUES) { createGithubIssue( repoUrl: buildManifestObj.getRepo("${local_component}"), issueTitle: "[AUTOCUT] Integration Test failed for ${local_component}: ${version}", diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index 12cda4f87f..7e567c5c42 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -99,8 +99,6 @@ pipeline { env.platform = buildManifestObj.build.platform env.artifactPath = buildManifestObj.getArtifactRoot(BUILD_JOB_NAME, buildId) env.AGENT_LABEL = agent_nodes["${env.platform}_${architecture}"] - env.updateGithubIssues = (params.UPDATE_GITHUB_ISSUES && (env.distribution == 'tar')) - echo "GitHub issue update is set to : ${env.updateGithubIssues.toBoolean()}" } } post { @@ -210,7 +208,7 @@ pipeline { localPath: "${WORKSPACE}/${distribution}", switchUserNonRoot: "${switch_user_non_root}" ) - if (env.updateGithubIssues.toBoolean()) { + if (params.UPDATE_GITHUB_ISSUES) { updateGitHubIssueLabels( repoUrl: buildManifestObj.getRepo("${local_component}"), issueTitle: "[AUTOCUT] Integration Test failed for ${local_component}: ${version}", @@ -222,7 +220,7 @@ pipeline { } catch (e) { echo "Error running integtest for component ${local_component}, creating Github issue" String issueBodyMessage = "The integration test failed at distribution level for component ${local_component}
Version: ${version}
Distribution: ${distribution}
Architecture: ${architecture}
Platform: ${platform}

Please check the logs: ${RUN_DISPLAY_URL}

* Test-report manifest:*
- https://ci.opensearch.org/ci/dbc/${JOB_NAME}/${version}/${buildId}/${platform}/${architecture}/${distribution}/test-results/${BUILD_NUMBER}/integ-test/test-report.yml

_Note: Steps to reproduce, additional logs and other files can be found within the above test-report manifest.
Instructions of this test-report manifest can be found [here](https://github.com/opensearch-project/opensearch-build/tree/main/src/report_workflow#guide-on-test-report-manifest-from-ci)._" - if (env.updateGithubIssues.toBoolean()) { + if (params.UPDATE_GITHUB_ISSUES) { createGithubIssue( repoUrl: buildManifestObj.getRepo("${local_component}"), issueTitle: "[AUTOCUT] Integration Test failed for ${local_component}: ${version}", diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt index c94d6899f8..0ba6581b96 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt @@ -34,7 +34,6 @@ BuildManifest.getDistribution() BuildManifest.getArtifactRoot(distribution-build-opensearch-dashboards, 215) BuildManifest.getArtifactRoot(distribution-build-opensearch, 215) - integ-test.echo(GitHub issue update is set to : false) integ-test.echo(Version: 3.0.0, VersionOpenSearch: 3.0.0, Agent: Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, OSD_BuildId: 215, OS_BuildId: 215, Distribution: tar) integ-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt index ac9e008900..7ffa93e03a 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt @@ -27,7 +27,6 @@ BuildManifest.getArtifactBuildId() BuildManifest.getDistribution() BuildManifest.getArtifactRoot(distribution-build-opensearch, 9010) - integ-test.echo(GitHub issue update is set to : true) integ-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) integ-test.stage(integ-test, groovy.lang.Closure)