Update lib location on jenkins/ to the remote repository opensearch-b…

…uild-libraries (#2652) * update lib location Signed-off-by: Jeff Lu <[email protected]> * issue_2646 Signed-off-by: Jeff Lu <[email protected]> * update new Lib buildPipelineTest.groovy Signed-off-by: Jeff Lu <[email protected]> * update regression files Signed-off-by: Jeff Lu <[email protected]> * update test lib with override and setting up main as default version in BuildPipelineTest Signed-off-by: Jeff Lu <[email protected]> * update lib location on tests/jenkins/jobs and associated regression files Signed-off-by: Jeff Lu <[email protected]> * remove unnecessary import statement Signed-off-by: Jeff Lu <[email protected]> Signed-off-by: Jeff Lu <[email protected]>
opensearch-project · Sep 28, 2022 · af69515 · af69515
1 parent 0bbeeb2
commit af69515
Show file tree

Hide file tree

Showing 81 changed files with 397 additions and 126 deletions.
diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/cross-cluster-replication/perf-test.jenkinsfile b/jenkins/cross-cluster-replication/perf-test.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211118", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     agent none

diff --git a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/docker/docker-copy.jenkinsfile b/jenkins/docker/docker-copy.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/docker/docker-scan.jenkinsfile b/jenkins/docker/docker-scan.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/opensearch-dashboards/bwc-test.jenkinsfile b/jenkins/opensearch-dashboards/bwc-test.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211118", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211118", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     agent {

diff --git a/jenkins/opensearch-ruby/opensearch-ruby.jenkinsfile b/jenkins/opensearch-ruby/opensearch-ruby.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/opensearch/bwc-test.jenkinsfile b/jenkins/opensearch/bwc-test.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211118", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211118", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/opensearch/perf-test.jenkinsfile b/jenkins/opensearch/perf-test.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211118", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     agent none

diff --git a/jenkins/promotion/promote-artifacts.jenkinsfile b/jenkins/promotion/promote-artifacts.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/promotion/promote-docker-ecr.jenkinsfile b/jenkins/promotion/promote-docker-ecr.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/promotion/promote-yum-repos.jenkinsfile b/jenkins/promotion/promote-yum-repos.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/release-notes-check/release-notes-check.jenkinsfile b/jenkins/release-notes-check/release-notes-check.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/release-tag/release-tag.jenkinsfile b/jenkins/release-tag/release-tag.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     options {

diff --git a/jenkins/rpm-validation/rpm-validation.jenkinsfile b/jenkins/rpm-validation/rpm-validation.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: "jenkins@20211123", retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     agent none

diff --git a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile
@@ -1,4 +1,7 @@
-lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
+lib = library(identifier: '[email protected]', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
 
 pipeline {
     agent {

diff --git a/tests/jenkins/BuildPipelineTest.groovy b/tests/jenkins/BuildPipelineTest.groovy
@@ -10,7 +10,7 @@ package jenkins.tests
 
 import org.junit.*
 import static com.lesfurets.jenkins.unit.global.lib.LibraryConfiguration.library
-import static com.lesfurets.jenkins.unit.global.lib.ProjectSource.projectSource
+import static com.lesfurets.jenkins.unit.global.lib.GitSource.gitSource
 import com.lesfurets.jenkins.unit.*
 import org.yaml.snakeyaml.Yaml
 
@@ -36,11 +36,11 @@ abstract class BuildPipelineTest extends CommonPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('<notNeeded>')
+                .defaultVersion('main')
                 .allowOverride(true)
                 .implicit(true)
-                .targetPath('<notNeeded>')
-                .retriever(projectSource())
+                .targetPath('vars')
+                .retriever(gitSource('https://github.com/opensearch-project/opensearch-build-libraries.git'))
                 .build()
             )
 
@@ -51,6 +51,8 @@ abstract class BuildPipelineTest extends CommonPipelineTest {
         binding.setVariable('scm', {})
 
         helper.registerAllowedMethod("legacySCM", [Closure.class], null)
+
+        helper.registerAllowedMethod("modernSCM", [Map.class], null)
 
         helper.registerAllowedMethod("library", [Map.class], { Map args ->
             helper.getLibLoader().loadLibrary(args["identifier"])

diff --git a/tests/jenkins/TestCCRPerfTest.groovy b/tests/jenkins/TestCCRPerfTest.groovy
@@ -15,8 +15,12 @@ import static org.hamcrest.CoreMatchers.equalTo
 import static org.hamcrest.CoreMatchers.hasItem
 import static org.hamcrest.MatcherAssert.assertThat
 
+import static com.lesfurets.jenkins.unit.global.lib.LibraryConfiguration.library
+import static com.lesfurets.jenkins.unit.global.lib.GitSource.gitSource
+
 class TestCCRPerfTest extends BuildPipelineTest {
 
+    @Override   
     @Before
     void setUp() {
         this.registerLibTester(new RunPerfTestScriptLibTester(
@@ -29,6 +33,16 @@ class TestCCRPerfTest extends BuildPipelineTest {
             true
         ))
         super.setUp()
+
+        helper.registerSharedLibrary(
+            library().name('jenkins')
+                .defaultVersion('1.0.0')
+                .allowOverride(true)
+                .implicit(true)
+                .targetPath('vars')
+                .retriever(gitSource('https://github.com/opensearch-project/opensearch-build-libraries.git'))
+                .build()
+        )
     }
 
     @Test

diff --git a/tests/jenkins/TestCopyContainer.groovy b/tests/jenkins/TestCopyContainer.groovy
@@ -7,14 +7,18 @@
  */
 import jenkins.tests.BuildPipelineTest
 import org.junit.*
+import static com.lesfurets.jenkins.unit.global.lib.LibraryConfiguration.library
+import static com.lesfurets.jenkins.unit.global.lib.GitSource.gitSource
 
 class TestCopyContainer extends BuildPipelineTest {
 
     String sourceImage = 'alpine:3.15.4'
     String destinationImage = 'alpine:3.15.4'
 
+    @Override
     @Before
     void setUp() {
+
         binding.setVariable('DOCKER_USERNAME', 'dummy_docker_username')
         binding.setVariable('DOCKER_PASSWORD', 'dummy_docker_password')
         binding.setVariable('ARTIFACT_PROMOTION_ROLE_NAME', 'sample-agent-AssumeRole')
@@ -23,6 +27,15 @@ class TestCopyContainer extends BuildPipelineTest {
         helper.registerAllowedMethod('withAWS', [Map, Closure], null)
         super.setUp()
 
+        helper.registerSharedLibrary(
+            library().name('jenkins')
+                .defaultVersion('1.0.0')
+                .allowOverride(true)
+                .implicit(true)
+                .targetPath('vars')
+                .retriever(gitSource('https://github.com/opensearch-project/opensearch-build-libraries.git'))
+                .build()
+        )
     }
 
     @Test

diff --git a/tests/jenkins/TestDataPrepperReleaseArtifacts.groovy b/tests/jenkins/TestDataPrepperReleaseArtifacts.groovy
@@ -14,10 +14,14 @@ import static org.hamcrest.CoreMatchers.hasItems
 import static org.hamcrest.CoreMatchers.notNullValue
 import static org.hamcrest.MatcherAssert.assertThat
 
+import static com.lesfurets.jenkins.unit.global.lib.LibraryConfiguration.library
+import static com.lesfurets.jenkins.unit.global.lib.GitSource.gitSource
+
 class TestDataPrepperReleaseArtifacts extends BuildPipelineTest {
 
     private String version
 
+    @Override
     @Before
     void setUp() {
 
@@ -45,6 +49,16 @@ class TestDataPrepperReleaseArtifacts extends BuildPipelineTest {
         })
 
         helper.registerAllowedMethod('s3Upload', [Map], {})
+
+        helper.registerSharedLibrary(
+            library().name('jenkins')
+                .defaultVersion('1.0.0')
+                .allowOverride(true)
+                .implicit(true)
+                .targetPath('vars')
+                .retriever(gitSource('https://github.com/opensearch-project/opensearch-build-libraries.git'))
+                .build()
+        )
     }
 
     @Test

diff --git a/tests/jenkins/TestMavenSignReleaseJob.groovy b/tests/jenkins/TestMavenSignReleaseJob.groovy
@@ -7,9 +7,12 @@
 import jenkins.tests.BuildPipelineTest
 import org.junit.Before
 import org.junit.Test
+import static com.lesfurets.jenkins.unit.global.lib.LibraryConfiguration.library
+import static com.lesfurets.jenkins.unit.global.lib.GitSource.gitSource
 
 class TestMavenSignReleaseJob extends BuildPipelineTest {
 
+    @Override
     @Before
     void setUp() {
 
@@ -36,6 +39,16 @@ class TestMavenSignReleaseJob extends BuildPipelineTest {
 
         helper.registerAllowedMethod('checkout', [Map], {})
 
+        helper.registerSharedLibrary(
+            library().name('jenkins')
+                .defaultVersion('1.0.0')
+                .allowOverride(true)
+                .implicit(true)
+                .targetPath('vars')
+                .retriever(gitSource('https://github.com/opensearch-project/opensearch-build-libraries.git'))
+                .build()
+        )
+
     }
 
     @Test

diff --git a/tests/jenkins/TestOpenSearchBwcTest.groovy b/tests/jenkins/TestOpenSearchBwcTest.groovy
@@ -8,9 +8,12 @@ import jenkins.tests.BuildPipelineTest
 import org.junit.Before
 import org.junit.Test
 import org.yaml.snakeyaml.Yaml
+import static com.lesfurets.jenkins.unit.global.lib.LibraryConfiguration.library
+import static com.lesfurets.jenkins.unit.global.lib.GitSource.gitSource
 
 class TestOpenSearchBwcTest extends BuildPipelineTest {
 
+    @Override
     @Before
     void setUp() {
         def jobName = "dummy_job"
@@ -48,6 +51,16 @@ class TestOpenSearchBwcTest extends BuildPipelineTest {
         })
 
         helper.registerAllowedMethod('findFiles', [Map.class], null)
+
+        helper.registerSharedLibrary(
+            library().name('jenkins')
+                .defaultVersion('1.0.0')
+                .allowOverride(true)
+                .implicit(true)
+                .targetPath('vars')
+                .retriever(gitSource('https://github.com/opensearch-project/opensearch-build-libraries.git'))
+                .build()
+        )
     }
 
     @Test