Skip to content

Commit

Permalink
Update current feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Your Name committed Jan 26, 2024
1 parent 8c2cc55 commit 0e64964
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/itest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
required: true
env:
CIUXCONFIG: /tmp/ciux.sh
CIUX_VERSION: 769944575a
CIUX_VERSION: 769944575a
GHA_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
MINIMAL: ${{ inputs.minimal }}
NOSCIENCE: ${{ inputs.noscience }}
Expand Down Expand Up @@ -45,16 +45,10 @@ jobs:
- name: Push image to local registry
id: push
run: |
# FIXME make it simpler
if image=$(ciux get image --check $PWD $SUFFIX_OPT)
then
echo "IMAGE=$image" >> "$GITHUB_OUTPUT"
else
. "$CIUXCONFIG"
. ./conf.sh
docker push $IMAGE
echo "IMAGE=$IMAGE" >> "$GITHUB_OUTPUT"
fi
integration-tests:
name: Run integration tests
runs-on: [self-hosted, v3]
Expand Down
15 changes: 12 additions & 3 deletions conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,19 @@ MINIMAL="${MINIMAL:-false}"

# Build parameters
# ----------------
# Repository address on self-hosted runner
CI_REPO="${CI_REPO:-$CX_IMAGE_REGISTRY}"

IMAGE="$CI_REPO/$CIUX_IMAGE_NAME:$CIUX_IMAGE_TAG"
# TODO make it simpler!!
if [ "$FINK_BROKER_VERSION" != "$CIUX_IMAGE_TAG" ]
then
# We need to build the image
# and eventually set repository address on self-hosted runner
REGISTRY="${CI_REPO:-$CIUX_IMAGE_REGISTRY}"
else
# We can use an existing image
REGISTRY="$CIUX_IMAGE_REGISTRY"
fi

IMAGE="$REGISTRY/$CIUX_IMAGE_NAME:$CIUX_IMAGE_TAG"
PROMOTED_IMAGE="$CIUX_IMAGE_REGISTRY/$CIUX_IMAGE_NAME:$CIUX_IMAGE_TAG"

# Spark parameters
Expand Down

0 comments on commit 0e64964

Please sign in to comment.