Cleanup rpm-validation jenkins job

Signed-off-by: Divya Madala <[email protected]>
opensearch-project · Sep 19, 2024 · 97615c2 · 97615c2
1 parent d3b9f14
commit 97615c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 126 deletions.
diff --git a/docs/Releasing-the-Distribution.md b/docs/Releasing-the-Distribution.md
@@ -67,7 +67,6 @@ These are the issues created by automation with the distribution build and integ
 | [OpenSearch Dashboards Integ Test](https://build.ci.opensearch.org/job/integ-test-opensearch-dashboards/)                     |  Workflow that runs integ tests for OpenSearch Dashboards and its components.                   |
 | [Benchmark Tests](https://build.ci.opensearch.org/job/benchmark-test/)                                                           |    Workflow that runs Performance tests using [opensearch-benchmark](https://github.com/opensearch-project/opensearch-benchmark) on a cluster created with a given version.                |
 | [BWC Tests](https://build.ci.opensearch.org/job/bwc-test/)                                                                    |  Workflow that runs backward compatibility tests on a cluster created with a given version.                   |
-| [RPM Validation](https://build.ci.opensearch.org/job/rpm-validation/)                                                         |   Workflow that validates the RPM distribution                  |
 | [Docker Build](https://build.ci.opensearch.org/job/docker-build/)                                                             |   Workflow that builds the   OpenSearch  and OpenSearch Dashboards docker images           |
 | [Docker Copy](https://build.ci.opensearch.org/job/docker-copy/)                                                               |  Workflow that copies the created docker images to multiple DockerHub and ECR repositories                   |
 | [Docker Scan](https://build.ci.opensearch.org/job/docker-scan/)                                                               |     Workflow that checks vulnerabilities for a given docker image as an input.                |

diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -320,14 +320,8 @@ pipeline {
                                     echo "artifactUrl (linux, x64, rpm): ${artifactUrl}"
 
                                     String bundleManifestUrl = buildManifestObj.getBundleManifestUrl(JOB_NAME, BUILD_NUMBER)
-                                    parallel([
-                                        'integ-test': {
-                                            triggerIntegrationTests(buildManifestUrl, buildManifestUrlOpenSearch, 'linux', 'rpm')
-                                        },
-                                        'rpm-validation': {
-                                            triggerRpmValidation(bundleManifestUrl)
-                                        }
-                                    ])
+
+                                    triggerIntegrationTests(buildManifestUrl, buildManifestUrlOpenSearch, 'linux', 'rpm')
                                 }
                             }
                             post {
@@ -672,14 +666,8 @@ pipeline {
                                     echo "artifactUrl (linux, arm64, rpm): ${artifactUrl}"
 
                                     String bundleManifestUrl = buildManifestObj.getBundleManifestUrl(JOB_NAME, BUILD_NUMBER)
-                                    parallel([
-                                        'integ-test': {
-                                            triggerIntegrationTests(buildManifestUrl, buildManifestUrlOpenSearch, 'linux', 'rpm')
-                                        },
-                                        'rpm-validation': {
-                                            triggerRpmValidation(bundleManifestUrl)
-                                        }
-                                    ])
+
+                                    triggerIntegrationTests(buildManifestUrl, buildManifestUrlOpenSearch, 'linux', 'rpm')
                                 }
                             }
                             post {
@@ -1064,18 +1052,6 @@ def triggerBWCTests(String buildManifestUrl, String platform, String distributio
     }
 }
 
-def triggerRpmValidation(String bundleManifestUrl) {
-    echo "Triggering RPM validation for ${bundleManifestUrl}"
-    def rpmValidationResults =
-            build job: 'rpm-validation',
-            propagate: false,
-            wait: false,
-            parameters: [
-                string(name: 'BUNDLE_MANIFEST_URL', value: bundleManifestUrl),
-                string(name: 'AGENT_LABEL', value: AGENT_LINUX_X64)
-            ]
-}
-
 def addMessageToNotificationQueue() {
     lib.jenkins.Messages.new(this).add("${STAGE_NAME}", lib.jenkins.Messages.new(this).get(["${STAGE_NAME}"]))
 }

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -338,14 +338,8 @@ pipeline {
                                     echo "artifactUrl (linux, x64, rpm): ${artifactUrl}"
 
                                     String bundleManifestUrl = buildManifestObj.getBundleManifestUrl(JOB_NAME, BUILD_NUMBER)
-                                    parallel([
-                                        'integ-test': {
-                                            triggerIntegrationTests(buildManifestUrl, 'linux', 'rpm')
-                                        },
-                                        'rpm-validation': {
-                                            triggerRpmValidation(bundleManifestUrl)
-                                        }
-                                    ])
+
+                                    triggerIntegrationTests(buildManifestUrl, 'linux', 'rpm')
                                 }
                             }
                             post {
@@ -646,14 +640,8 @@ pipeline {
                                     echo "artifactUrl (linux, arm64, rpm): ${artifactUrl}"
 
                                     String bundleManifestUrl = buildManifestObj.getBundleManifestUrl(JOB_NAME, BUILD_NUMBER)
-                                    parallel([
-                                        'integ-test': {
-                                            triggerIntegrationTests(buildManifestUrl, 'linux', 'rpm')
-                                        },
-                                        'rpm-validation': {
-                                            triggerRpmValidation(bundleManifestUrl)
-                                        }
-                                    ])
+
+                                    triggerIntegrationTests(buildManifestUrl, 'linux', 'rpm')
                                 }
                             }
                             post {
@@ -1036,18 +1024,6 @@ def triggerBWCTests(String buildManifestUrl, String platform, String distributio
     }
 }
 
-def triggerRpmValidation(String bundleManifestUrl) {
-    echo "Triggering RPM validation for ${bundleManifestUrl}"
-    def rpmValidationResults =
-            build job: 'rpm-validation',
-            propagate: false,
-            wait: false,
-            parameters: [
-                string(name: 'BUNDLE_MANIFEST_URL', value: bundleManifestUrl),
-                string(name: 'AGENT_LABEL', value: AGENT_LINUX_X64)
-            ]
-}
-
 def verifyParameterPlatformDistribution(String paramName, String allowedValue) {
     echo("Verify Parameter '$paramName'")
     def paramValue = env."$paramName"

diff --git a/jenkins/rpm-validation/rpm-validation.jenkinsfile b/jenkins/rpm-validation/rpm-validation.jenkinsfile