Remove BuildManifest changes

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
opensearch-project · Jan 12, 2022 · 2654e7d · 2654e7d
1 parent c7a1d69
commit 2654e7d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 25 deletions.
diff --git a/src/jenkins/BuildManifest.groovy b/src/jenkins/BuildManifest.groovy
@@ -10,14 +10,12 @@ package jenkins
 
 class BuildManifest implements Serializable {
     class Build implements Serializable {
-        String id
         String name
         String version
         String platform
         String architecture
 
         Build(Map data) {
-            this.id = data.id
             this.name = data.name
             this.version = data.version
             this.platform = data.platform
@@ -51,23 +49,6 @@ class BuildManifest implements Serializable {
             this.getArtifactRoot(jobName, buildNumber)
         ].join('/')
     }
-
-    public String getDistUrl(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 getArtifactArchitecture() {
-        return this.build.architecture
-    }
-
-    public String getArtifactBuildId() {
-        return this.build.id
-    }
 }
 
 
diff --git a/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt
@@ -44,6 +44,4 @@ https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/mani
                      assembleUpload.readYaml({file=builds/opensearch/manifest.yml})
                      BuildManifest.asBoolean()
                      InputManifest.getPublicDistUrl(https://ci.opensearch.org/dbc, vars-build, 33, linux, x64)
-                     BuildManifest.getDistUrl(https://ci.opensearch.org/dbc, vars-build, 33)
                      assembleUpload.echo(Setting env."ARTIFACT_URL_linux_x64"=https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/opensearch-1.1.0-linux-x64.tar.gz)
-                     assembleUpload.echo(Setting env."BUILD_MANIFEST_URL_linux_x64"=https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/manifest.yml)
diff --git a/tests/jenkins/jobs/AssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/AssembleUpload_Jenkinsfile.txt
@@ -35,6 +35,4 @@ https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/mani
                   assembleUpload.readYaml({file=tests/data/opensearch-build-1.1.0.yml})
                   BuildManifest.asBoolean()
                   InputManifest.getPublicDistUrl(https://ci.opensearch.org/dbc, vars-build, 33, linux, x64)
-                  BuildManifest.getDistUrl(https://ci.opensearch.org/dbc, vars-build, 33)
                   assembleUpload.echo(Setting env."ARTIFACT_URL_linux_x64"=https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/opensearch-1.1.0-linux-x64.tar.gz)
-                  assembleUpload.echo(Setting env."BUILD_MANIFEST_URL_linux_x64"=https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/manifest.yml)
diff --git a/tests/jenkins/jobs/BuildAssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/BuildAssembleUpload_Jenkinsfile.txt
@@ -42,6 +42,4 @@ https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/mani
                      assembleUpload.readYaml({file=builds/opensearch/manifest.yml})
                      BuildManifest.asBoolean()
                      InputManifest.getPublicDistUrl(https://ci.opensearch.org/dbc, vars-build, 33, linux, x64)
-                     BuildManifest.getDistUrl(https://ci.opensearch.org/dbc, vars-build, 33)
                      assembleUpload.echo(Setting env."ARTIFACT_URL_linux_x64"=https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/opensearch-1.1.0-linux-x64.tar.gz)
-                     assembleUpload.echo(Setting env."BUILD_MANIFEST_URL_linux_x64"=https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/dist/opensearch/manifest.yml)