Fix URL of component yml for reporting on dashboards (#3928)

Signed-off-by: Zelin Hao <[email protected]>
opensearch-project · Aug 25, 2023 · a296c1d · a296c1d
1 parent 7c4d391
commit a296c1d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -1,4 +1,4 @@
-lib = library(identifier: 'jenkins@5.6.0', retriever: modernSCM([
+lib = library(identifier: 'jenkins@5.7.1', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -1,4 +1,4 @@
-lib = library(identifier: 'jenkins@5.6.0', retriever: modernSCM([
+lib = library(identifier: 'jenkins@5.7.1', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

diff --git a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy
@@ -24,7 +24,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('5.6.0')
+                .defaultVersion('5.7.1')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')

diff --git a/tests/jenkins/TestOpenSearchIntegTest.groovy b/tests/jenkins/TestOpenSearchIntegTest.groovy
@@ -23,7 +23,7 @@ class TestOpenSearchIntegTest extends BuildPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('5.6.0')
+                .defaultVersion('5.7.1')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')

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
@@ -1,6 +1,6 @@
    integ-test.run()
       integ-test.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git})
-      integ-test.library({identifier=jenkins@5.6.0, retriever=null})
+      integ-test.library({identifier=jenkins@5.7.1, retriever=null})
       integ-test.pipeline(groovy.lang.Closure)
          integ-test.credentials(jenkins-artifact-bucket-name)
          integ-test.timeout({time=4, unit=HOURS})
@@ -13,13 +13,13 @@
                integ-test.fileExists(manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/3.0.0/215/linux/x64/tar/builds/opensearch-dashboards/opensearch-dashboards-3.0.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                   downloadBuildManifest.legacySCM(groovy.lang.Closure)
-                  downloadBuildManifest.library({identifier=jenkins@5.5.0, retriever=null})
+                  downloadBuildManifest.library({identifier=jenkins@5.7.1, retriever=null})
                   downloadBuildManifest.sh(curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/3.0.0/215/linux/x64/tar/builds/opensearch-dashboards/opensearch-dashboards-3.0.0-linux-x64.tar.gz --output tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml)
                   downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                   BuildManifest.asBoolean()
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0/215/linux/x64/tar/dist/opensearch/opensearch-3.0.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-3.0.0-build.yml})
                   downloadBuildManifest.legacySCM(groovy.lang.Closure)
-                  downloadBuildManifest.library({identifier=jenkins@5.5.0, retriever=null})
+                  downloadBuildManifest.library({identifier=jenkins@5.7.1, retriever=null})
                   downloadBuildManifest.sh(curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0/215/linux/x64/tar/dist/opensearch/opensearch-3.0.0-linux-x64.tar.gz --output tests/jenkins/data/opensearch-3.0.0-build.yml)
                   downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-3.0.0-build.yml})
                   BuildManifest.asBoolean()
@@ -41,7 +41,7 @@
             integ-test.script(groovy.lang.Closure)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/3.0.0/215/linux/x64/tar/builds/opensearch-dashboards/opensearch-dashboards-3.0.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                   downloadBuildManifest.legacySCM(groovy.lang.Closure)
-                  downloadBuildManifest.library({identifier=jenkins@5.5.0, retriever=null})
+                  downloadBuildManifest.library({identifier=jenkins@5.7.1, retriever=null})
                   downloadBuildManifest.sh(curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/3.0.0/215/linux/x64/tar/builds/opensearch-dashboards/opensearch-dashboards-3.0.0-linux-x64.tar.gz --output tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml)
                   downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                   BuildManifest.asBoolean()
@@ -80,7 +80,7 @@
                         integ-test.sh(rm -rf test-results)
                         integ-test.runIntegTestScript({jobName=distribution-build-opensearch-dashboards, componentName=ganttChartDashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false})
                            runIntegTestScript.legacySCM(groovy.lang.Closure)
-                           runIntegTestScript.library({identifier=jenkins@5.5.0, retriever=null})
+                           runIntegTestScript.library({identifier=jenkins@5.7.1, retriever=null})
                            runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            BuildManifest.getDistribution()
@@ -106,7 +106,7 @@ ccc -R opensearch-project/dashboards-visualizations --comment "Closing the issue
                         integ-test.echo(Completed running integtest for component ganttChartDashboards)
                         integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, jobName=dummy_job})
                            uploadTestResults.legacySCM(groovy.lang.Closure)
-                           uploadTestResults.library({identifier=jenkins@5.5.0, retriever=null})
+                           uploadTestResults.library({identifier=jenkins@5.7.1, retriever=null})
                            uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            uploadTestResults.echo(Build Id: 215)
@@ -131,7 +131,7 @@ ccc -R opensearch-project/dashboards-visualizations --comment "Closing the issue
                         integ-test.sh(rm -rf test-results)
                         integ-test.runIntegTestScript({jobName=distribution-build-opensearch-dashboards, componentName=indexManagementDashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false})
                            runIntegTestScript.legacySCM(groovy.lang.Closure)
-                           runIntegTestScript.library({identifier=jenkins@5.5.0, retriever=null})
+                           runIntegTestScript.library({identifier=jenkins@5.7.1, retriever=null})
                            runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            BuildManifest.getDistribution()
@@ -157,7 +157,7 @@ ccc -R opensearch-project/index-management-dashboards-plugin --comment "Closing
                         integ-test.echo(Completed running integtest for component indexManagementDashboards)
                         integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, jobName=dummy_job})
                            uploadTestResults.legacySCM(groovy.lang.Closure)
-                           uploadTestResults.library({identifier=jenkins@5.5.0, retriever=null})
+                           uploadTestResults.library({identifier=jenkins@5.7.1, retriever=null})
                            uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            uploadTestResults.echo(Build Id: 215)
@@ -182,7 +182,7 @@ ccc -R opensearch-project/index-management-dashboards-plugin --comment "Closing
                         integ-test.sh(rm -rf test-results)
                         integ-test.runIntegTestScript({jobName=distribution-build-opensearch-dashboards, componentName=anomalyDetectionDashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false})
                            runIntegTestScript.legacySCM(groovy.lang.Closure)
-                           runIntegTestScript.library({identifier=jenkins@5.5.0, retriever=null})
+                           runIntegTestScript.library({identifier=jenkins@5.7.1, retriever=null})
                            runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            BuildManifest.getDistribution()
@@ -208,7 +208,7 @@ ccc -R opensearch-project/anomaly-detection-dashboards-plugin --comment "Closing
                         integ-test.echo(Completed running integtest for component anomalyDetectionDashboards)
                         integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, jobName=dummy_job})
                            uploadTestResults.legacySCM(groovy.lang.Closure)
-                           uploadTestResults.library({identifier=jenkins@5.5.0, retriever=null})
+                           uploadTestResults.library({identifier=jenkins@5.7.1, retriever=null})
                            uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            uploadTestResults.echo(Build Id: 215)
@@ -233,7 +233,7 @@ ccc -R opensearch-project/anomaly-detection-dashboards-plugin --comment "Closing
                         integ-test.sh(rm -rf test-results)
                         integ-test.runIntegTestScript({jobName=distribution-build-opensearch-dashboards, componentName=OpenSearch-Dashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false})
                            runIntegTestScript.legacySCM(groovy.lang.Closure)
-                           runIntegTestScript.library({identifier=jenkins@5.5.0, retriever=null})
+                           runIntegTestScript.library({identifier=jenkins@5.7.1, retriever=null})
                            runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            BuildManifest.getDistribution()
@@ -259,7 +259,7 @@ ccc -R opensearch-project/OpenSearch-Dashboards --comment "Closing the issue as
                         integ-test.echo(Completed running integtest for component OpenSearch-Dashboards)
                         integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, jobName=dummy_job})
                            uploadTestResults.legacySCM(groovy.lang.Closure)
-                           uploadTestResults.library({identifier=jenkins@5.5.0, retriever=null})
+                           uploadTestResults.library({identifier=jenkins@5.7.1, retriever=null})
                            uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            uploadTestResults.echo(Build Id: 215)
@@ -284,7 +284,7 @@ ccc -R opensearch-project/OpenSearch-Dashboards --comment "Closing the issue as
                         integ-test.sh(rm -rf test-results)
                         integ-test.runIntegTestScript({jobName=distribution-build-opensearch-dashboards, componentName=reportsDashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false})
                            runIntegTestScript.legacySCM(groovy.lang.Closure)
-                           runIntegTestScript.library({identifier=jenkins@5.5.0, retriever=null})
+                           runIntegTestScript.library({identifier=jenkins@5.7.1, retriever=null})
                            runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            BuildManifest.getDistribution()
@@ -310,7 +310,7 @@ ccc -R opensearch-project/dashboards-reports --comment "Closing the issue as the
                         integ-test.echo(Completed running integtest for component reportsDashboards)
                         integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, jobName=dummy_job})
                            uploadTestResults.legacySCM(groovy.lang.Closure)
-                           uploadTestResults.library({identifier=jenkins@5.5.0, retriever=null})
+                           uploadTestResults.library({identifier=jenkins@5.7.1, retriever=null})
                            uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            uploadTestResults.echo(Build Id: 215)
@@ -335,7 +335,7 @@ ccc -R opensearch-project/dashboards-reports --comment "Closing the issue as the
                         integ-test.sh(rm -rf test-results)
                         integ-test.runIntegTestScript({jobName=distribution-build-opensearch-dashboards, componentName=queryWorkbenchDashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false})
                            runIntegTestScript.legacySCM(groovy.lang.Closure)
-                           runIntegTestScript.library({identifier=jenkins@5.5.0, retriever=null})
+                           runIntegTestScript.library({identifier=jenkins@5.7.1, retriever=null})
                            runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            BuildManifest.getDistribution()
@@ -361,7 +361,7 @@ ccc -R opensearch-project/sql --comment "Closing the issue as the Integration Te
                         integ-test.echo(Completed running integtest for component queryWorkbenchDashboards)
                         integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, jobName=dummy_job})
                            uploadTestResults.legacySCM(groovy.lang.Closure)
-                           uploadTestResults.library({identifier=jenkins@5.5.0, retriever=null})
+                           uploadTestResults.library({identifier=jenkins@5.7.1, retriever=null})
                            uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            uploadTestResults.echo(Build Id: 215)
@@ -386,7 +386,7 @@ ccc -R opensearch-project/sql --comment "Closing the issue as the Integration Te
                         integ-test.sh(rm -rf test-results)
                         integ-test.runIntegTestScript({jobName=distribution-build-opensearch-dashboards, componentName=observabilityDashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false})
                            runIntegTestScript.legacySCM(groovy.lang.Closure)
-                           runIntegTestScript.library({identifier=jenkins@5.5.0, retriever=null})
+                           runIntegTestScript.library({identifier=jenkins@5.7.1, retriever=null})
                            runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            BuildManifest.getDistribution()
@@ -412,7 +412,7 @@ ccc -R opensearch-project/dashboards-observability --comment "Closing the issue
                         integ-test.echo(Completed running integtest for component observabilityDashboards)
                         integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, jobName=dummy_job})
                            uploadTestResults.legacySCM(groovy.lang.Closure)
-                           uploadTestResults.library({identifier=jenkins@5.5.0, retriever=null})
+                           uploadTestResults.library({identifier=jenkins@5.7.1, retriever=null})
                            uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
                            BuildManifest.asBoolean()
                            uploadTestResults.echo(Build Id: 215)
@@ -435,13 +435,13 @@ ccc -R opensearch-project/dashboards-observability --comment "Closing the issue
                integ-test.unstash(integtest-opensearch-dashboards-215)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0/215/linux/x64/tar/dist/opensearch/opensearch-3.0.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-3.0.0-build.yml})
                   downloadBuildManifest.legacySCM(groovy.lang.Closure)
-                  downloadBuildManifest.library({identifier=jenkins@5.5.0, retriever=null})
+                  downloadBuildManifest.library({identifier=jenkins@5.7.1, retriever=null})
                   downloadBuildManifest.sh(curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0/215/linux/x64/tar/dist/opensearch/opensearch-3.0.0-linux-x64.tar.gz --output tests/jenkins/data/opensearch-3.0.0-build.yml)
                   downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-3.0.0-build.yml})
                   BuildManifest.asBoolean()
                integ-test.createUploadTestReportManifest({testManifest=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml, buildManifest=tests/jenkins/data/opensearch-3.0.0-build.yml, dashboardsBuildManifest=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml, testRunID=215, testType=integ-test, componentName=})
                   createUploadTestReportManifest.legacySCM(groovy.lang.Closure)
-                  createUploadTestReportManifest.library({identifier=jenkins@main, retriever=null})
+                  createUploadTestReportManifest.library({identifier=jenkins@5.7.1, retriever=null})
                   createUploadTestReportManifest.readYaml({file=manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml})
                   TestManifest.asBoolean()
                   createUploadTestReportManifest.readYaml({file=tests/jenkins/data/opensearch-3.0.0-build.yml})