RING-44102 - git archive prefix spark/ ~ playbooks (#39)

scality · Sep 21, 2023 · e90db8d · e90db8d
1 parent bec80a5
commit e90db8d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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."