typo

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
gaiksaya · Jan 17, 2024 · 8b3345a · 8b3345a
1 parent be4fe40
commit 8b3345a
Showing 1 changed file with 23 additions and 14 deletions.
diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -86,6 +86,28 @@ pipeline {
                         currentBuild.result = 'ABORTED'
                         error("Integration Tests failed to start. Build manifest url was not provided.")
                     }
+                    downloadBuildManifest(
+                        url: BUILD_MANIFEST_URL,
+                        path: BUILD_MANIFEST
+                    )
+
+                    def buildManifestObj = lib.jenkins.BuildManifest.new(readYaml(file: BUILD_MANIFEST))
+                    def testManifestObj = lib.jenkins.TestManifest.new(readYaml(file: "manifests/${TEST_MANIFEST}"))
+                    def componentDefaultList = testManifestObj.getComponentNames()
+                    def componentList = COMPONENT_NAME ? COMPONENT_NAME.trim().split(" ") as List : componentDefaultList
+                    env.architecture = buildManifestObj.getArtifactArchitecture()
+                    env.platform = buildManifestObj.getArtifactPlatform()
+                    env.buildId = buildManifestObj.getArtifactBuildId()
+                    env.distribution = buildManifestObj.getDistribution()
+                    env.version = buildManifestObj.build.version
+                    env.platform = buildManifestObj.build.platform
+                    env.artifactPath = buildManifestObj.getArtifactRoot(BUILD_JOB_NAME, buildId)
+                    env.AGENT_LABEL = agent_nodes["${env.platform}_${architecture}"]
+                    env.updateGithubIssues = UPDATE_GITHUB_ISSUES && env.distribution == 'tar'
+
+
+                    echo "Version: ${version}, Agent: ${AGENT_LABEL}, BuildId: ${buildId}, Distribution: ${distribution}, Components: ${componentList}"
+                    currentBuild.description = "$TEST_MANIFEST, $version, $architecture, $platform, $buildId, $distribution, $componentList"
                 }
             }
             post {
@@ -111,19 +133,6 @@ pipeline {
                     def componentDefaultList = testManifestObj.getComponentNames()
                     def componentsInBuildManifest = buildManifestObj.getNames()
                     def componentList = COMPONENT_NAME ? COMPONENT_NAME.trim().split(" ") as List : componentDefaultList
-                    env.architecture = buildManifestObj.getArtifactArchitecture()
-                    env.platform = buildManifestObj.getArtifactPlatform()
-                    env.buildId = buildManifestObj.getArtifactBuildId()
-                    env.distribution = buildManifestObj.getDistribution()
-                    env.version = buildManifestObj.build.version
-                    env.platform = buildManifestObj.build.platform
-                    env.artifactPath = buildManifestObj.getArtifactRoot(BUILD_JOB_NAME, buildId)
-                    env.AGENT_LABEL = agent_nodes["${env.platform}_${architecture}"]
-                    env.updateGithubIssues = UPDATE_GITHUB_ISSUES && env.distribution == 'tar'
-
-
-                    echo "Version: ${version}, Agent: ${AGENT_LABEL}, BuildId: ${buildId}, Distribution: ${distribution}, Components: ${componentList}"
-                    currentBuild.description = "$TEST_MANIFEST, $version, $architecture, $platform, $buildId, $distribution, $componentList"
                     String switch_user_non_root = (distribution.equals('rpm') || distribution.equals('deb')) ? 'true' : 'false'
                     echo "switch_user_non_root: ${switch_user_non_root}"
                     echo "componentList: ${componentList}"
@@ -133,7 +142,7 @@ pipeline {
                             error("${component_check} is not present in the test manifest: ${TEST_MANIFEST}")
                         }
                         if (!componentsInBuildManifest.contains(component_check)) {
-                            error("${component_check} is not present in the provided build manifest: ${BUILD_MANIFEST}")
+                            echo"${component_check} is not present in the provided build manifest. Tests will be skipped for ${component_check}"
                         }
                     }