More changes

Signed-off-by: Zelin Hao <[email protected]>
opensearch-project · Aug 23, 2022 · 8aac754 · 8aac754
1 parent cb07cf7
commit 8aac754
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 62 deletions.
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
                         componentName: COMPONENT_NAME,
                         inputManifest: "manifests/$INPUT_MANIFEST",
                         status: "NOT_STARTED",
-                        stage: "START"
+                        stage: "INITIALIZE_STAGE"
                     )
                 }
             }
@@ -138,7 +138,6 @@ pipeline {
                                             stage: "integ_test_x64"
                                         )
 
-
                                         env.ARTIFACT_URL_X64_TAR_INTEG_TEST_RESULT = createTestResultsMessage(
                                             testType: "Integ Tests (x64, tar)",
                                             status: integTestResults.getResult(),
@@ -558,10 +557,10 @@ pipeline {
                     buildInfoYaml(
                         componentName: COMPONENT_NAME,
                         status: currentBuild.result,
-                        stage: "COMPLETE"
+                        stage: "FINALIZE_STAGE"
                     )
-                    unstash "job_yml"
-                    archiveArtifacts artifacts: 'job.yml'
+                    unstash "buildInfo_yml"
+                    archiveArtifacts artifacts: 'buildInfo.yml'
                     postCleanup()
                 }
             }

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
                         componentName: COMPONENT_NAME,
                         inputManifest: "manifests/$INPUT_MANIFEST",
                         status: "NOT_STARTED",
-                        stage: "START"
+                        stage: "INITIALIZE_STAGE"
                     )
                 }
             }
@@ -624,10 +624,10 @@ pipeline {
                     buildInfoYaml(
                         componentName: COMPONENT_NAME,
                         status: currentBuild.result,
-                        stage: "COMPLETE"
+                        stage: "FINALIZE_STAGE"
                     )
-                    unstash "job_yml"
-                    archiveArtifacts artifacts: 'job.yml'
+                    unstash "buildInfo_yml"
+                    archiveArtifacts artifacts: 'buildInfo.yml'
                     postCleanup()
                 }
             }

diff --git a/tests/jenkins/TestBuildInfoYaml.groovy b/tests/jenkins/TestBuildInfoYaml.groovy
@@ -18,9 +18,9 @@ class TestBuildInfoYaml extends BuildPipelineTest {
         this.registerLibTester(new BuildInfoYamlLibTester(
                 '',
                 'tests/jenkins/data/opensearch-2.2.0.yml',
-                'tests/jenkins/data/job.yml',
+                'tests/jenkins/data/buildInfo.yml',
                 'NOT_STARTED',
-                'START'
+                'INITIALIZE_STAGE'
             )
         )
         super.setUp()

diff --git a/tests/jenkins/data/job.yml → tests/jenkins/data/buildInfo.yml b/tests/jenkins/data/job.yml → tests/jenkins/data/buildInfo.yml
@@ -157,9 +157,5 @@ results:
   bwc_test_x64: NOT_STARTED
   integ_test_arm64: NOT_STARTED
   bwc_test_arm64: NOT_STARTED
-  x64_tar: NOT_STARTED
-  arm64_tar: NOT_STARTED
-  x64_rpm: NOT_STARTED
-  arm64_rpm: NOT_STARTED
   duration: 154442
   startTimestamp: 1660345758679
diff --git a/tests/jenkins/jobs/BuildInfoYaml_Jenkinsfile b/tests/jenkins/jobs/BuildInfoYaml_Jenkinsfile
@@ -15,30 +15,30 @@ pipeline {
                     buildInfoYaml(
                         componentName: "",
                         inputManifest: "tests/jenkins/data/opensearch-2.2.0.yml",
-                        outputFile: "tests/jenkins/data/job.yml",
+                        outputFile: "tests/jenkins/data/buildInfo.yml",
                         status: "NOT_STARTED",
-                        stage: "START"
+                        stage: "INITIALIZE_STAGE"
                     )
                     buildInfoYaml(
                         componentName: "",
-                        inputManifest: "tests/jenkins/data/job.yml",
-                        outputFile: "tests/jenkins/data/job.yml",
+                        inputManifest: "tests/jenkins/data/buildInfo.yml",
+                        outputFile: "tests/jenkins/data/buildInfo.yml",
                         status: "SUCCESS",
                         stage: "x64_tar"
                     )
                     buildInfoYaml(
                         componentName: "",
-                        inputManifest: "tests/jenkins/data/job.yml",
-                        outputFile: "tests/jenkins/data/job.yml",
+                        inputManifest: "tests/jenkins/data/buildInfo.yml",
+                        outputFile: "tests/jenkins/data/buildInfo.yml",
                         status: "6",
                         stage: "integ_test_x64"
                     )
                     buildInfoYaml(
                         componentName: "",
-                        inputManifest: "tests/jenkins/data/job.yml",
-                        outputFile: "tests/jenkins/data/job.yml",
+                        inputManifest: "tests/jenkins/data/buildInfo.yml",
+                        outputFile: "tests/jenkins/data/buildInfo.yml",
                         status: "SUCCESS",
-                        stage: "COMPLETE"
+                        stage: "FINALIZE_STAGE"
                     )
                 }
             }