Add rpm-validation pipelines trigger to opensearch and dashboards dis…

…tribution builds (#2021) * Add rpm-validation pipelines trigger to opensearch and dashboards distribution builds Signed-off-by: Peter Zhu <[email protected]> * Restore manifests Signed-off-by: Peter Zhu <[email protected]> * Add changes based on the comments Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Apr 22, 2022 · 8ebd79d · 8ebd79d
1 parent 464b769
commit 8ebd79d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -173,6 +173,16 @@ pipeline {
                             echo "buildManifestUrl (x64, rpm): ${buildManifestUrl}"
                             echo "artifactUrl (x64, rpm): ${artifactUrl}"
 
+                            String bundleManifestUrl = buildManifestObj.getBundleManifestUrl(JOB_NAME, BUILD_NUMBER)
+
+                            echo "Trigger rpm validation for x64 rpm ${bundleManifestUrl}"
+                            build job: 'rpm-validation',
+                            propagate: false,
+                            wait: true,
+                            parameters: [
+                                string(name: 'BUNDLE_MANIFEST_URL', value: bundleManifestUrl),
+                                string(name: 'AGENT_LABEL', value: AGENT_X64)
+                            ]
                         }
                     }
                     post {
@@ -347,6 +357,16 @@ pipeline {
                                     echo "buildManifestUrl (arm64, rpm): ${buildManifestUrl}"
                                     echo "artifactUrl (arm64, rpm): ${artifactUrl}"
 
+                                    String bundleManifestUrl = buildManifestObj.getBundleManifestUrl(JOB_NAME, BUILD_NUMBER)
+
+                                    echo "Trigger rpm validation for arm64 rpm ${bundleManifestUrl}"
+                                    build job: 'rpm-validation',
+                                    propagate: false,
+                                    wait: true,
+                                    parameters: [
+                                        string(name: 'BUNDLE_MANIFEST_URL', value: bundleManifestUrl),
+                                        string(name: 'AGENT_LABEL', value: AGENT_ARM64)
+                                    ]
                                 }
                             }
                             post {

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -72,7 +72,6 @@ pipeline {
                     }
                     steps {
                         script {
-                            git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main'
                             buildManifest(
                                 inputManifest: "manifests/${INPUT_MANIFEST}",
                                 distribution: 'tar',
@@ -112,7 +111,6 @@ pipeline {
                     }
                     steps {
                         script {
-                            git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main'
                             buildManifest(
                                 inputManifest: "manifests/${INPUT_MANIFEST}",
                                 distribution: 'tar',
@@ -237,6 +235,16 @@ pipeline {
                             echo "buildManifestUrl (x64, rpm): ${buildManifestUrl}"
                             echo "artifactUrl (x64, rpm): ${artifactUrl}"
 
+                            String bundleManifestUrl = buildManifestObj.getBundleManifestUrl(JOB_NAME, BUILD_NUMBER)
+
+                            echo "Trigger rpm validation for x64 rpm ${bundleManifestUrl}"
+                            build job: 'rpm-validation',
+                            propagate: false,
+                            wait: true,
+                            parameters: [
+                                string(name: 'BUNDLE_MANIFEST_URL', value: bundleManifestUrl),
+                                string(name: 'AGENT_LABEL', value: AGENT_X64)
+                            ]
                         }
                     }
                     post {
@@ -350,6 +358,16 @@ pipeline {
                             echo "buildManifestUrl (arm64, rpm): ${buildManifestUrl}"
                             echo "artifactUrl (arm64, rpm): ${artifactUrl}"
 
+                            String bundleManifestUrl = buildManifestObj.getBundleManifestUrl(JOB_NAME, BUILD_NUMBER)
+
+                            echo "Trigger rpm validation for arm64 rpm ${bundleManifestUrl}"
+                            build job: 'rpm-validation',
+                            propagate: false,
+                            wait: true,
+                            parameters: [
+                                string(name: 'BUNDLE_MANIFEST_URL', value: bundleManifestUrl),
+                                string(name: 'AGENT_LABEL', value: AGENT_ARM64)
+                            ]
                         }
                     }
                     post {

diff --git a/jenkins/rpm-validation/rpm-validation.jenkinsfile b/jenkins/rpm-validation/rpm-validation.jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
     parameters {
             string(
                 name: 'BUNDLE_MANIFEST_URL',
-                description: 'The bundle manifest url. (e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.0.0-rc1/2493/linux/x64/rpm/dist/opensearch/manifest.yml)',
+                description: 'The bundle manifest url, required for yum staging repo file. (e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.0.0-rc1/2493/linux/x64/rpm/dist/opensearch/manifest.yml)',
                 trim: true
             )
             string(

diff --git a/src/jenkins/BuildManifest.groovy b/src/jenkins/BuildManifest.groovy
@@ -140,6 +140,15 @@ class BuildManifest implements Serializable {
         ].join("/")
     }
 
+    public String getBundleManifestUrl(String publicArtifactUrl = 'https://ci.opensearch.org/ci/dbc', String jobName, String buildNumber) {
+        return [
+            this.getArtifactRootUrl(publicArtifactUrl, jobName, buildNumber),
+            'dist',
+            this.build.getFilename(),
+            'manifest.yml'
+        ].join("/")
+    }
+
     public String getArtifactUrl(String publicArtifactUrl = 'https://ci.opensearch.org/ci/dbc', String jobName, String buildNumber) {
         return [
             this.getArtifactRootUrl(publicArtifactUrl, jobName, buildNumber),