From 1c268c0f5f976fa6bae8336e58df8a001f08b535 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Wed, 28 Aug 2024 14:28:14 -0700 Subject: [PATCH] refactor Signed-off-by: Sayali Gaikawad --- jenkins/release-workflows/release-tag.jenkinsfile | 4 ++-- .../release-workflows/release-tag.jenkinsfile.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/release-workflows/release-tag.jenkinsfile b/jenkins/release-workflows/release-tag.jenkinsfile index c7b1b6c62e..9f9750487c 100644 --- a/jenkins/release-workflows/release-tag.jenkinsfile +++ b/jenkins/release-workflows/release-tag.jenkinsfile @@ -40,7 +40,7 @@ pipeline { steps { script { os_artifact_url = "https://artifacts.opensearch.org/releases/bundle/opensearch/$VERSION/opensearch-$VERSION-linux-x64.tar.gz" - sh "curl -SLO $os_artifact_url && tar -xf opensearch-$VERSION-linux-x64.tar.gz opensearch-$VERSION/manifest.yml" + sh "curl -SLO $os_artifact_url && tar -xf opensearch-$VERSION-linux-x64.tar.gz ${OS_DISTRIBUTION_MANIFEST}" echo "The release distribution manifest is downloaded to $OS_DISTRIBUTION_MANIFEST" createReleaseTag( distManifest: "$OS_DISTRIBUTION_MANIFEST", @@ -53,7 +53,7 @@ pipeline { steps { script { osd_artifact_url = "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/$VERSION/opensearch-dashboards-$VERSION-linux-x64.tar.gz" - sh "curl -SLO $osd_artifact_url && tar -xf opensearch-dashboards-$VERSION-linux-x64.tar.gz opensearch-dashboards-$VERSION/manifest.yml" + sh "curl -SLO $osd_artifact_url && tar -xf opensearch-dashboards-$VERSION-linux-x64.tar.gz ${OSD_DISTRIBUTION_MANIFEST}l" echo "The release distribution manifest is downloaded to $OSD_DISTRIBUTION_MANIFEST" createReleaseTag( distManifest: "$OSD_DISTRIBUTION_MANIFEST", diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-tag.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-tag.jenkinsfile.txt index 980e3d986a..e94d3117bc 100644 --- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-tag.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-tag.jenkinsfile.txt @@ -54,7 +54,7 @@ createReleaseTag.echo(Tag 2.16.0 has been created with identical commit ID. Skipping creating new tag for OpenSearch.) release-tag.stage(Create Release Tag for OpenSearch-Dasboards components, groovy.lang.Closure) release-tag.script(groovy.lang.Closure) - release-tag.sh(curl -SLO https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.16.0/opensearch-dashboards-2.16.0-linux-x64.tar.gz && tar -xf opensearch-dashboards-2.16.0-linux-x64.tar.gz opensearch-dashboards-2.16.0/manifest.yml) + release-tag.sh(curl -SLO https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.16.0/opensearch-dashboards-2.16.0-linux-x64.tar.gz && tar -xf opensearch-dashboards-2.16.0-linux-x64.tar.gz opensearch-dashboards-2.16.0/manifest.ymll) release-tag.echo(The release distribution manifest is downloaded to opensearch-dashboards-2.16.0/manifest.yml) release-tag.createReleaseTag({distManifest=opensearch-dashboards-2.16.0/manifest.yml, tagVersion=2.16.0}) createReleaseTag.legacySCM(groovy.lang.Closure)