From 70ea62839f53989f594959483e03cfc86b11dee4 Mon Sep 17 00:00:00 2001
From: Fabrice Jammes <fabrice.jammes@in2p3.fr>
Date: Tue, 3 Oct 2023 15:37:13 +0200
Subject: [PATCH 1/2] Bump finkctl to v1.1.0-rc2

---
 .github/workflows/itest-gha.yml              | 2 +-
 .github/workflows/itest.yml                  | 3 ++-
 examples/{alias-fink.sh => aliases-fink.zsh} | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename examples/{alias-fink.sh => aliases-fink.zsh} (79%)

diff --git a/.github/workflows/itest-gha.yml b/.github/workflows/itest-gha.yml
index aa65ba63..8666920d 100644
--- 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.yml b/.github/workflows/itest.yml
index 8da04102..10ace74f 100644
--- 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 b/examples/aliases-fink.zsh
similarity index 79%
rename from examples/alias-fink.sh
rename to examples/aliases-fink.zsh
index 9b12cc45..68bdc2ba 100644
--- a/examples/alias-fink.sh
+++ b/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
 

From 39c3e3e746135e50d005c3378929dadabb8142ab Mon Sep 17 00:00:00 2001
From: Fabrice Jammes <fabrice.jammes@in2p3.fr>
Date: Wed, 4 Oct 2023 07:50:16 +0200
Subject: [PATCH 2/2] Restrict science e2e tests for PR and push on master
 branch

---
 .github/workflows/itest-noscience.yml | 7 +++----
 .github/workflows/itest-science.yml   | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/itest-noscience.yml b/.github/workflows/itest-noscience.yml
index 9a8a9b2c..f2dcdca7 100644
--- 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
index 1d813ccf..6277365e 100644
--- 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