Use ciux labels

astrolabsoftware · Dec 15, 2023 · d959487 · d959487
1 parent a4bf010
commit d959487
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git 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-rc10
+  CIUX_VERSION: v0.0.1-rc11
   GHA_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   NOSCIENCE: true
   MINIMAL: true
@@ -24,15 +24,14 @@ jobs:
           go-version: '1.21.4'
       - name: Install ciux
         run: go install github.com/k8s-school/ciux@"${{ env.CIUX_VERSION }}"
-      - name: Check dependencies consistency
+      - name: Ciux project ignition
         run: ciux ignite $PWD
       - name: Build fink-broker image for k8s
         run: |
           ./build.sh
       - name: Export fink-broker image
         run: |
           docker images
-          . "$CIUXCONFIG"
           . ./conf.sh
           mkdir -p artifacts
           docker save "$IMAGE" > artifacts/image.tar
@@ -57,15 +56,14 @@ jobs:
         run: go install github.com/k8s-school/ciux@"${{ env.CIUX_VERSION }}"
       - name: Ciux project ignition
         run: |
-          ciux ignite $PWD --itest --branch="$GHA_BRANCH_NAME"
+          ciux ignite --selector ci --branch="$GHA_BRANCH_NAME" $PWD
       - name: Create k8s/kind cluster
         run: |
           ktbx install kind
           ktbx install kubectl
           ktbx create -s
       - name: Load fink-alert-simulator image inside kind
         run: |
-          . "$CIUXCONFIG"
           .  "$FINK_ALERT_SIMULATOR_DIR"/conf.sh
           if docker exec -t -- kind-control-plane crictl pull "$IMAGE"; then
             echo "::notice Succeeded to pull $IMAGE"
@@ -84,7 +82,6 @@ jobs:
           docker exec -- kind-control-plane crictl image
       - name: Install fink-alert-simulator pre-requisites (argoCD)
         run: |
-          . "$CIUXCONFIG"
           .  "$FINK_ALERT_SIMULATOR_DIR"/prereq-install.sh
       - name: Install strimzi (kafka-operator)
         run: ./itest/strimzi-install.sh
@@ -96,7 +93,6 @@ jobs:
         run: ./itest/minio-install.sh
       - name: Run fink-alert-simulator
         run: |
-          . "$CIUXCONFIG"
           "$FINK_ALERT_SIMULATOR_DIR"/argo-submit.sh
           argo watch @latest
       # - name: Setup tmate session

diff --git 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-rc10
+  CIUX_VERSION: v0.0.1-rc11
   GHA_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   MINIMAL: ${{ inputs.minimal }}
   NOSCIENCE: ${{ inputs.noscience }}
@@ -40,8 +40,8 @@ jobs:
           go-version: '1.21.4'
       - name: Install ciux
         run: go install github.com/k8s-school/ciux@"${{ env.CIUX_VERSION }}"
-      - name: Check dependencies consistency
-        run: ciux ignite $PWD
+      - name: Ciux project ignition
+        run: ciux ignite --selector build $PWD
       - name: Build fink-broker image for k8s
         run: |
           ./build.sh
@@ -68,7 +68,7 @@ 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 --selector ci --branch="$GHA_BRANCH_NAME" $PWD
       - name: Create ktbx configuration
         run: |
           mkdir -p $HOME/.ktbx
@@ -103,7 +103,6 @@ jobs:
           ktbx create -s
       - name: Load fink-alert-simulator image inside kind
         run: |
-          . "$CIUXCONFIG"
           .  "$FINK_ALERT_SIMULATOR_DIR"/conf.sh
           if docker exec -t -- kind-control-plane crictl pull "$IMAGE"; then
             echo "::notice Succeeded to pull $IMAGE"
@@ -121,7 +120,6 @@ jobs:
           fi
       - name: Install fink-alert-simulator pre-requisites (argo-workflows)
         run: |
-          . "$CIUXCONFIG"
           "$FINK_ALERT_SIMULATOR_DIR"/prereq-install.sh
       - name: Install strimzi (kafka-operator)
         run: ./itest/strimzi-install.sh
@@ -136,7 +134,6 @@ jobs:
         run: ./itest/minio-install.sh
       - name: Run fink-alert-simulator
         run: |
-          . "$CIUXCONFIG"
           "$FINK_ALERT_SIMULATOR_DIR"/argo-submit.sh
           argo watch @latest
       # - name: Setup tmate session