diff --git a/.ciux b/.ciux index 58eb5d08..7da0aa15 100644 --- a/.ciux +++ b/.ciux @@ -8,6 +8,6 @@ dependencies: pull: true - url: https://github.com/astrolabsoftware/finkctl clone: true - - image: gitlab-registry.in2p3.fr/astrolabsoftware/fink/k8s-spark-py:3.4.1 + - image: gitlab-registry.in2p3.fr/astrolabsoftware/fink/spark-py:k8s-3.4.1 - package: github.com/k8s-school/ktbx@v1.1.1-rc7 diff --git a/.github/workflows/itest-gha.yml b/.github/workflows/itest-gha.yml index 6097d49e..2037bb99 100644 --- a/.github/workflows/itest-gha.yml +++ b/.github/workflows/itest-gha.yml @@ -6,7 +6,7 @@ on: - master env: CIUXCONFIG: /tmp/ciux.sh - CIUX_VERSION: v0.0.1-rc8 + CIUX_VERSION: v0.0.1-rc9 GHA_BRANCH_NAME: ${{ github.head_ref || github.ref_name }} NOSCIENCE: true MINIMAL: true @@ -56,7 +56,8 @@ jobs: - name: Install ciux run: go install github.com/k8s-school/ciux@"${{ env.CIUX_VERSION }}" - name: Ciux project ignition - run: ciux ignite $PWD --itest --branch="$GHA_BRANCH_NAME" + run: | + ciux ignite $PWD --itest --branch="$GHA_BRANCH_NAME" - name: Create k8s/kind cluster run: | ktbx install kind diff --git a/.github/workflows/itest.yml b/.github/workflows/itest.yml index 336d6a53..9f188252 100644 --- a/.github/workflows/itest.yml +++ b/.github/workflows/itest.yml @@ -16,7 +16,7 @@ on: required: true env: CIUXCONFIG: /tmp/ciux.sh - CIUX_VERSION: v0.0.1-rc8 + CIUX_VERSION: v0.0.1-rc9 GHA_BRANCH_NAME: ${{ github.head_ref || github.ref_name }} MINIMAL: ${{ inputs.minimal }} NOSCIENCE: ${{ inputs.noscience }} diff --git a/build.sh b/build.sh index b2f7e0fa..36e43b27 100755 --- a/build.sh +++ b/build.sh @@ -36,5 +36,5 @@ else fi # Build image -docker image build --tag "$IMAGE" --build-arg spark_py_image="$SPARK_PY_IMAGE" "$DIR" --target $TARGET +docker image build --tag "$IMAGE" --build-arg spark_py_image="$ASTROLABSOFTWARE_FINK_SPARK_PY_IMAGE" "$DIR" --target $TARGET