From 53811b777f1a14b762c213202b5f724254a78ac3 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 18 Jul 2022 19:47:06 +0100
Subject: [PATCH] Correct promotion image and script

---
 ci/pipeline.yml       | 6 ------
 ci/scripts/promote.sh | 7 +++----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 868fdc9f..cba691eb 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -344,7 +344,6 @@ jobs:
 - name: promote-milestone
   serial: true
   plan:
-  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -354,7 +353,6 @@ jobs:
       download_artifacts: false
       save_build_info: true
   - task: promote
-    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: M
@@ -373,7 +371,6 @@ jobs:
 - name: promote-rc
   serial: true
   plan:
-  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -383,7 +380,6 @@ jobs:
       download_artifacts: false
       save_build_info: true
   - task: promote
-    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: RC
@@ -402,7 +398,6 @@ jobs:
 - name: promote-release
   serial: true
   plan:
-  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -412,7 +407,6 @@ jobs:
       download_artifacts: true
       save_build_info: true
   - task: promote
-    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: RELEASE
diff --git a/ci/scripts/promote.sh b/ci/scripts/promote.sh
index ae5a1435..bd160019 100755
--- a/ci/scripts/promote.sh
+++ b/ci/scripts/promote.sh
@@ -1,18 +1,17 @@
 #!/bin/bash
 
-source $(dirname $0)/common.sh
 CONFIG_DIR=git-repo/ci/config
 
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json
 
-java -jar /opt/concourse-release-scripts.jar \
+java -jar /concourse-release-scripts.jar \
   --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
   publishToCentral $RELEASE_TYPE $BUILD_INFO_LOCATION artifactory-repo || { exit 1; }
 
-java -jar /opt/concourse-release-scripts.jar \
+java -jar /concourse-release-scripts.jar \
   --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
   promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }
 
 echo "Promotion complete"
-echo $version > version/version
\ No newline at end of file
+echo $version > version/version