Merge pull request #749 from astrolabsoftware/debug-self-hosted-runner

Fix finkctl version in e2e tests
astrolabsoftware · Oct 4, 2023 · 2b85239 · 2b85239
2 parents 78403ba + 39c3e3e
commit 2b85239
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/itest-gha.yml b/.github/workflows/itest-gha.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
 env:
-  FINKCTL_VERSION: v1.1.0-rc1
+  FINKCTL_VERSION: v1.1.0-rc2
   NOSCIENCE: true
   MINIMAL: true
 

diff --git a/.github/workflows/itest-noscience.yml b/.github/workflows/itest-noscience.yml
@@ -1,9 +1,8 @@
 name: "Fink-broker e2e workflow (noscience, self-hosted)"
 on:
-  push:
-  pull_request:
-    branches:
-      - master
+  schedule:
+    # At 03:00 UTC on every day-of-week from Monday through Friday.
+    - cron:  '0 3 * * 1-5'
 
 jobs:
   call-workflow-passing-data:

diff --git a/.github/workflows/itest-science.yml b/.github/workflows/itest-science.yml
@@ -4,8 +4,8 @@ on:
     # At 05:00 UTC on every day-of-week from Monday through Friday.
     - cron:  '0 5 * * 1-5'
   push:
-    # branches:
-    #   - master
+    branches:
+      - master
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/itest.yml b/.github/workflows/itest.yml
@@ -16,6 +16,7 @@ on:
         required: true
 
 env:
+  FINKCTL_VERSION: v1.1.0-rc2
   MINIMAL: ${{ inputs.minimal }}
   NOSCIENCE: ${{ inputs.noscience }}
   # Override the self-hosted runner value
@@ -126,7 +127,7 @@ jobs:
         with:
           go-version: '1.19.2'
       - name: Install finkctl
-        run: go install github.com/astrolabsoftware/finkctl@v1.0.0
+        run: go install github.com/astrolabsoftware/finkctl@"${{ env.FINKCTL_VERSION }}"
       - name: Run fink-alert-simulator
         run: |
           "${{ env.FINK_ALERT_SIMULATOR_DIR }}"/argo-submit.sh

diff --git a/examples/alias-fink.sh → examples/aliases-fink.zsh b/examples/alias-fink.sh → examples/aliases-fink.zsh
@@ -9,9 +9,11 @@ MYSHELL=$(echo $SHELL)
 MYSHELL=$(basename $MYSHELL)
 source <(finkctl completion $MYSHELL)
 
-FINK_BROKER_SRC_DIR="$HOME/src/fink-broker"
-FINK_ALERT_SIM_SRC_DIR="$HOME/src/fink-alert-simulator"
-FINKCTL_SRC_DIR="$HOME/src/finkctl"
+ASTROLAB_DIR="$HOME/src/astrolabsoftware"
+
+FINK_BROKER_SRC_DIR="$ASTROLAB_DIR/fink-broker"
+FINK_ALERT_SIM_SRC_DIR="$ASTROLAB_DIR/fink-alert-simulator"
+FINKCTL_SRC_DIR="$ASTROLAB_DIR/finkctl"
 
 export FINKCONFIG=$FINK_BROKER_SRC_DIR/itest