From 6fb223540e566ca389adf497992577e1b66b90fb Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sat, 27 Feb 2021 20:10:50 -0600
Subject: [PATCH 1/3] Added triggers from MR for downstream benchmarks.

 - using JUGGLER_DETECTOR_VERSION to communicate which branch to use downstream
 - using JUGGLER_DETECTOR (=topside) to communicate detector to build in
   benchmarks.
 - Added views directory for ci yml files

	new file:   views/view1.yml
---
 .gitlab-ci.yml   | 168 ++++++++++++++---------------------------------
 views/config.yml |  61 +++++++++++++++++
 views/view1.yml  |  21 ++++++
 views/view2.yml  |  17 +++++
 views/view3.yml  |  17 +++++
 views/view6.yml  |  17 +++++
 views/view7.yml  |  17 +++++
 7 files changed, 199 insertions(+), 119 deletions(-)
 create mode 100644 views/config.yml
 create mode 100644 views/view1.yml
 create mode 100644 views/view2.yml
 create mode 100644 views/view3.yml
 create mode 100644 views/view6.yml
 create mode 100644 views/view7.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5ecf67..51a680b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,13 @@
 image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
 
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+    - if: '$CI_PIPELINE_SOURCE == "webide"'
+    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_TAG'
+
 default:
   before_script:
     - mkdir -p images && mkdir -p doc/
@@ -9,18 +17,38 @@ default:
     paths:
       - images/
       - doc/
+    reports:
+      dotenv: juggler.env
 
 stages:
+  - config
   - build
   - docs
   - test 
   - finalize 
   - deploy
 
+env:
+  stage: config 
+  script:
+    - export JUGGLER_DETECTOR="topside"
+    - |
+      if [ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" ]; then
+        export JUGGLER_DETECTOR_VERSION="${CI_COMMIT_REF_NAME}"
+        echo "JUGGLER_DETECTOR         = ${JUGGLER_DETECTOR}"
+        echo "JUGGLER_DETECTOR_VERSION = ${CI_COMMIT_REF_NAME}"
+        echo "JUGGLER_DETECTOR_VERSION=$CI_COMMIT_REF_NAME" >> juggler.env
+        echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
+      fi
+  artifacts:
+    reports:
+      dotenv: juggler.env
+
+
 compile:
   stage: build
-  tags:
-    - silicon
+  needs:
+    - ["env"]
   script:
     - echo "Build successful."
 
@@ -28,109 +56,25 @@ compile:
   stage: docs
   needs:
     - ["compile"]
-  tags:
-    - silicon
   artifacts:
     paths:
       - images/
       - doc/
 
-dawn_view1:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view01 -d scripts/view1 -D
-dawn_view1:ev1:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view01_ev1 -d scripts/view1 -s 2
-dawn_view2:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
-dawn_view2:ev1:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view02_ev1 -d scripts/view2 -s 2
-dawn_view3:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view03 -d scripts/view3 -D
-dawn_view3:ev1:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view03_ev1 -d scripts/view3 -s 2
-dawn_view3:ev3:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view03_ev1 -d scripts/view3 -s 3
-dawn_view3:ev4:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view03_ev1 -d scripts/view3 -s 4
-dawn_view6:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view06 -d scripts/view6 -D
-dawn_view7:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view07 -d scripts/view7 -D
-dawn_view11:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -D
-dawn_view11:ev0:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11
-dawn_view11:ev1:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 1
-dawn_view11:ev2:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 2
-dawn_view11:ev3:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 3
-dawn_view11:ev4:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 4
-dawn_view12:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view12 -d scripts/view12 -D
-dawn_view13:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view13 -d scripts/view13 -D
-dawn_view14:detector:
-  extends: .views
-  script:
-    - ./bin/make_dawn_views -t view14 -d scripts/view14 -D
+include:
+  - local: 'views/view1.yml'
+  - local: 'views/view2.yml'
+  - local: 'views/view3.yml'
+  - local: 'views/view6.yml'
+  - local: 'views/view7.yml'
+  - local: 'views/config.yml'
 
 report:
-  stage: test
+  stage: finalize
   needs: 
-    - "dawn_view1:detector"
-    - "dawn_view2:detector"
-    - "dawn_view3:detector"
-    - "dawn_view1:ev1"
-    - "dawn_view2:ev1"
-    - "dawn_view3:ev1"
-    - "dawn_view3:ev3"
-    - "dawn_view3:ev4"
-    - "dawn_view6:detector"
-    - "dawn_view7:detector"
-    - "dawn_view11:detector"
-    - "dawn_view12:detector"
-    - "dawn_view13:detector"
-    - "dawn_view14:detector"
-  tags:
-    - silicon
+    - view_01
+    - dawn_view_02:detector
+    - dawn_view_03:detector
   artifacts:
     paths:
       - images/
@@ -142,54 +86,40 @@ report:
 
 overlap_check:
   stage: test
-  tags:
-    - silicon
   needs: 
     - ["compile"]
   script:
-    #- $(exit $(checkOverlaps -c topside.xml  | tee doc/overlap_check.out | wc -l ))
     - checkOverlaps -c topside.xml  | tee doc/overlap_check.out 
     - echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..."
     - if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "1" ]] ; then echo "Overlaps exist!" && false ; fi
-      # allow_failure: true
-
 
 topside:config_testing:
   stage: test
-  tags:
-    - silicon
   needs: 
     - ["compile"]
   script:
-    #- $(exit $(checkOverlaps -c topside.xml  | tee doc/overlap_check.out | wc -l ))
     - checkOverlaps -c topside.xml  | tee doc/overlap_check.out | wc -l
     - cat doc/overlap_check.out
   allow_failure: true
 
 benchmarks:reconstruction:
   stage: deploy
+  variables:
+    JUGGLER_DETECTOR: "$JUGGLER_DETECTOR"
+    JUGGLER_DETECTOR_VERSION: "$JUGGLER_DETECTOR_VERSION"
   trigger:
     project: EIC/benchmarks/reconstruction_benchmarks
     strategy: depend
-  needs: ["overlap_check","report"]
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      when: never
-    - when: on_success
+  needs: ["env","overlap_check","report"]
   
 
 benchmarks:physics:
   stage: deploy
+  variables:
+    JUGGLER_DETECTOR: "$JUGGLER_DETECTOR"
+    JUGGLER_DETECTOR_VERSION: "$JUGGLER_DETECTOR_VERSION"
   trigger:
     project: EIC/benchmarks/physics_benchmarks
     strategy: depend
-  needs: ["overlap_check","report"]
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      when: never
-    - when: on_success
+  needs: ["env","overlap_check","report"]
 
diff --git a/views/config.yml b/views/config.yml
new file mode 100644
index 0000000..1004a27
--- /dev/null
+++ b/views/config.yml
@@ -0,0 +1,61 @@
+
+#dawn_view_03:detector:
+#  extends: .views
+#  script:
+#    - ./bin/make_dawn_views -t view03 -d scripts/view3 -D
+#dawn_view_03:ev001:
+#  extends: .views
+#  script:
+#    - ./bin/make_dawn_views -t view03_ev001 -d scripts/view3 -s 2
+#dawn_view_03:ev003:
+#  extends: .views
+#  script:
+#    - ./bin/make_dawn_views -t view03_ev100 -d scripts/view3 -s 3
+#dawn_view_03:ev004:
+#  extends: .views
+#  script:
+#    - ./bin/make_dawn_views -t view03_ev001 -d scripts/view3 -s 4
+#dawn_view_06:detector:
+#  extends: .views
+#  script:
+#    - ./bin/make_dawn_views -t view06 -d scripts/view6 -D
+#dawn_view_07:detector:
+#  extends: .views
+#  script:
+#    - ./bin/make_dawn_views -t view07 -d scripts/view7 -D
+dawn_view_11:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view11 -d scripts/view11 -D
+dawn_view_11:ev000:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view11 -d scripts/view11
+dawn_view_11:ev001:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 1
+dawn_view_11:ev002:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 2
+dawn_view_11:ev003:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 3
+dawn_view_11:ev004:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 4
+dawn_view_12:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view12 -d scripts/view12 -D
+dawn_view_13:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view13 -d scripts/view13 -D
+dawn_view_14:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view14 -d scripts/view14 -D
diff --git a/views/view1.yml b/views/view1.yml
new file mode 100644
index 0000000..9f92c43
--- /dev/null
+++ b/views/view1.yml
@@ -0,0 +1,21 @@
+dawn_view_01:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view01 -d scripts/view1 -D
+dawn_view_01:ev001:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view01_ev001 -d scripts/view1 -s 1
+dawn_view_01:ev002:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view01_ev001 -d scripts/view1 -s 2
+
+view_01:
+  stage: test
+  needs:
+    - ["dawn_view_01:detector", "dawn_view_01:ev001","dawn_view_01:ev002"]
+  script:
+    - ls -lrth *
+    - ls -lrth images/*
+
diff --git a/views/view2.yml b/views/view2.yml
new file mode 100644
index 0000000..047e51d
--- /dev/null
+++ b/views/view2.yml
@@ -0,0 +1,17 @@
+dawn_view_02:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+dawn_view_02:ev002:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+
+view_02:
+  stage: test
+  needs:
+    - ["dawn_view_02:detector", "dawn_view_02:ev002"]
+  script:
+    - ls -lrth *
+    - ls -lrth images/*
+
diff --git a/views/view3.yml b/views/view3.yml
new file mode 100644
index 0000000..69f1187
--- /dev/null
+++ b/views/view3.yml
@@ -0,0 +1,17 @@
+dawn_view_03:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+dawn_view_03:ev002:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+
+view_03:
+  stage: test
+  needs:
+    - ["dawn_view_03:detector", "dawn_view_03:ev002"]
+  script:
+    - ls -lrth *
+    - ls -lrth images/*
+
diff --git a/views/view6.yml b/views/view6.yml
new file mode 100644
index 0000000..a78f465
--- /dev/null
+++ b/views/view6.yml
@@ -0,0 +1,17 @@
+dawn_view_06:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+dawn_view_06:ev002:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+
+view_06:
+  stage: test
+  needs:
+    - ["dawn_view_06:detector", "dawn_view_06:ev002"]
+  script:
+    - ls -lrth *
+    - ls -lrth images/*
+
diff --git a/views/view7.yml b/views/view7.yml
new file mode 100644
index 0000000..0e308a3
--- /dev/null
+++ b/views/view7.yml
@@ -0,0 +1,17 @@
+dawn_view_07:detector:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+dawn_view_07:ev002:
+  extends: .views
+  script:
+    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+
+view_07:
+  stage: test
+  needs:
+    - ["dawn_view_07:detector", "dawn_view_07:ev002"]
+  script:
+    - ls -lrth *
+    - ls -lrth images/*
+
-- 
GitLab


From 53d3f5981a6d4f02389fdd97011ad3bd3de656d5 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sun, 28 Feb 2021 01:37:44 -0600
Subject: [PATCH 2/3] 	modified:   views/view6.yml

---
 views/view6.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/view6.yml b/views/view6.yml
index a78f465..0195a74 100644
--- a/views/view6.yml
+++ b/views/view6.yml
@@ -2,10 +2,10 @@ dawn_view_06:detector:
   extends: .views
   script:
     - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
-dawn_view_06:ev002:
+dawn_view_06:ev004:
   extends: .views
   script:
-    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+    - ./bin/make_dawn_views -t view02_ev004 -d scripts/view2 -s 4
 
 view_06:
   stage: test
-- 
GitLab


From 9f2b8c5b45135af63b7428a1ee469f92a487d061 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sun, 28 Feb 2021 01:39:40 -0600
Subject: [PATCH 3/3] 	modified:   views/view6.yml

---
 views/view6.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/view6.yml b/views/view6.yml
index 0195a74..f0fda5c 100644
--- a/views/view6.yml
+++ b/views/view6.yml
@@ -10,7 +10,7 @@ dawn_view_06:ev004:
 view_06:
   stage: test
   needs:
-    - ["dawn_view_06:detector", "dawn_view_06:ev002"]
+    - ["dawn_view_06:detector", "dawn_view_06:ev004"]
   script:
     - ls -lrth *
     - ls -lrth images/*
-- 
GitLab