From 85c9517423659a20f1c34bbd06aee5c0476342a4 Mon Sep 17 00:00:00 2001
From: Carsten Bauer <carsten.bauer@uni-paderborn.de>
Date: Mon, 23 May 2022 13:20:59 +0200
Subject: [PATCH] ci (almost done)

---
 .gitlab-ci-N2.yml | 10 ++++------
 .gitlab-ci.yml    |  9 +++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci-N2.yml b/.gitlab-ci-N2.yml
index a0682844..7e13455b 100644
--- a/.gitlab-ci-N2.yml
+++ b/.gitlab-ci-N2.yml
@@ -10,18 +10,16 @@ julia/1.7-N2:
     SCHEDULER_PARAMETERS: "-N 1 -n 1 -c 128 -t 00:15:00 -A pc2-mitarbeiter -p fpga --exclusive"
     JULIA_NUM_THREADS: "12"
   rules:
-    # - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"' # trigger on PRs (external?)
-    # when: manual
-    # allow_failure: true
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' # trigger on PRs (internal?)
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
+      when: manual
     - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
     - if: '$CI_COMMIT_BRANCH' # trigger on commits
+    - when: never # don't run otherwise
     # - if: '$CI_PIPELINE_SOURCE == "push"' # trigger on pushs
     # - if: '$CI_COMMIT_TAG' # trigger on tags? (only needed for docs)
   script:
-    - echo $CI_PIPELINE_SOURCE
-    - echo $CI_PIPELINE_SOURCE
     - echo $CI_PIPELINE_SOURCE
     - ml reset
     - ml tools/likwid/5.2.1-GCC-11.2.0
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7d6de7c..2cd6e043 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,19 +11,20 @@ build-likwid:
   tags:
     - testcluster
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' # trigger on PRs (internal?)
+    - if: '$CI_COMMIT_TAG' # trigger on tags
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
+      when: manual
     - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
     - if: '$CI_COMMIT_BRANCH' # trigger on commits
-    - if: '$CI_COMMIT_TAG' # trigger on tags?
+    - when: never # don't run otherwise
   variables:
     SLURM_NODELIST: medusa
     LIKWID_MODULE: likwid/5.2-dev
     LIKWID_VERSION: 5.2.0
     CUDA_MODULE: cuda/11.0
   script:
-      - echo $CI_PIPELINE_SOURCE
-      - echo $CI_PIPELINE_SOURCE
       - echo $CI_PIPELINE_SOURCE
       - module load "$LIKWID_MODULE" "$CUDA_MODULE"
       - export LIKWID_PREFIX=$(realpath $(dirname $(which likwid-topology))/..)