Update references of rockcraft.yaml to images/charmed-spark/rockcraft…

….yaml
canonical · Jun 14, 2024 · 23bd4de · 23bd4de
1 parent b3c7329
commit 23bd4de
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -23,8 +23,8 @@ jobs:
  - name: Extract ROCK metadata
  shell: bash
  run: |
- VERSION=$(yq '(.version|split("-"))[0]' rockcraft.yaml)
- BASE=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
+ VERSION=$(yq '(.version|split("-"))[0]' images/charmed-spark/rockcraft.yaml)
+ BASE=$(yq '(.base|split("@"))[1]' images/charmed-spark/rockcraft.yaml)
  echo "version=${VERSION}" >> $GITHUB_OUTPUT
  echo "base=${BASE}" >> $GITHUB_OUTPUT
  id: rock_metadata

diff --git a/tests/integration/integration-tests-jupyter.sh b/tests/integration/integration-tests-jupyter.sh
@@ -15,7 +15,7 @@
 NAMESPACE=tests
 
 get_spark_version(){
- SPARK_VERSION=$(yq '(.version)' rockcraft.yaml)
+ SPARK_VERSION=$(yq '(.version)' images/charmed-spark/rockcraft.yaml)
  echo "$SPARK_VERSION"
 }
 

diff --git a/tests/integration/integration-tests-kyuubi.sh b/tests/integration/integration-tests-kyuubi.sh
@@ -27,8 +27,8 @@ S3_BUCKET=kyuubi
 
 
 get_spark_version(){
- # Fetch Spark version from rockcraft.yaml
- yq '(.version)' rockcraft.yaml
+ # Fetch Spark version from images/charmed-spark/rockcraft.yaml
+ yq '(.version)' images/charmed-spark/rockcraft.yaml
 }
 
 

diff --git a/tests/integration/integration-tests.sh b/tests/integration/integration-tests.sh
@@ -16,7 +16,7 @@
 NAMESPACE=tests
 
 get_spark_version(){
- SPARK_VERSION=$(yq '(.version)' rockcraft.yaml)
+ SPARK_VERSION=$(yq '(.version)' images/charmed-spark/rockcraft.yaml)
  echo "$SPARK_VERSION"
 }