From e90db8de2c6cbcd8aee3e14cc3678d0fa9ae53f9 Mon Sep 17 00:00:00 2001
From: illuminatus <trevor.benson@scality.com>
Date: Thu, 21 Sep 2023 15:20:06 -0700
Subject: [PATCH] RING-44102 - git archive prefix spark/ ~ playbooks (#39)

---
 .github/workflows/release.yml                           | 2 +-
 ansible/roles/stage-spark-cluster/templates/setup.sh.j2 | 2 +-
 scripts/offline-archive-setup.sh                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 582ac7a..93e8cda 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
           sudo apt-get install -y makeself
       - name: Create Archive from Spark
         run: |
-          git archive --output=${{ env.staging_path }}/spark-repo.tar --format=tar HEAD
+          git archive --prefix=spark/ --output=${{ env.staging_path }}/spark-repo.tar --format=tar HEAD
       - name: Pull containers from ${{ env.registry }}
         run: |
           docker pull ${{ env.registry }}/spark/spark-master:latest
diff --git a/ansible/roles/stage-spark-cluster/templates/setup.sh.j2 b/ansible/roles/stage-spark-cluster/templates/setup.sh.j2
index 2cdbc54..b0c770c 100644
--- a/ansible/roles/stage-spark-cluster/templates/setup.sh.j2
+++ b/ansible/roles/stage-spark-cluster/templates/setup.sh.j2
@@ -17,4 +17,4 @@ ${sudo} cd ../ && mv ./staging /var/tmp/
 ${sudo} tar -C /root -x -v -f {{ staging_path }}spark-repo.tar spark/ansible
 ${sudo} echo -e "{{ staging_archive }} has extracted itself.\n"
 ${sudo} echo -e "To continue with the staged deployment cd into ~/spark/ansible"
-${sudo} echo -e"and execute run.yml without the staging tag."
+${sudo} echo -e "and execute run.yml without the staging tag."
diff --git a/scripts/offline-archive-setup.sh b/scripts/offline-archive-setup.sh
index 2d36e85..94327cc 100644
--- a/scripts/offline-archive-setup.sh
+++ b/scripts/offline-archive-setup.sh
@@ -17,4 +17,4 @@ ${sudo} cd ../ && mv ./staging /var/tmp/
 ${sudo} tar -C /root -x -v -f /var/tmp/staging/spark-repo.tar spark/ansible
 ${sudo} echo -e "spark-offline-archive.run has extracted itself.\n"
 ${sudo} echo -e "To continue with the staged deployment cd into ~/spark/ansible"
-${sudo} echo -e"and execute run.yml without the staging tag."
+${sudo} echo -e "and execute run.yml without the staging tag."