From 8fc7b9486b19a6690fda1f19d5dcc28b3adc2929 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong Date: Tue, 16 Mar 2021 11:47:22 -0500 Subject: [PATCH 1/2] Added all the views to the final collection of artifacts. --- .gitlab-ci.yml | 6 ++++-- views/view2.yml | 10 +++++++++- views/view3.yml | 6 +++++- views/view6.yml | 14 +++++++++++++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b481a2f..258e483 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,8 +73,10 @@ report: stage: finalize needs: - view_01 - - dawn_view_02:detector - - dawn_view_03:detector + - view_02 + - view_03 + - view_06 + - view_07 artifacts: paths: - images/ diff --git a/views/view2.yml b/views/view2.yml index 047e51d..8215719 100644 --- a/views/view2.yml +++ b/views/view2.yml @@ -2,15 +2,23 @@ dawn_view_02:detector: extends: .views script: - ./bin/make_dawn_views -t view02 -d scripts/view2 -D +dawn_view_02:ev001: + extends: .views + script: + - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1 dawn_view_02:ev002: extends: .views script: - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2 +dawn_view_02:ev003: + extends: .views + script: + - ./bin/make_dawn_views -t view02_ev003 -d scripts/view2 -s 3 view_02: stage: test needs: - - ["dawn_view_02:detector", "dawn_view_02:ev002"] + - ["dawn_view_02:detector", "dawn_view_02:ev001", "dawn_view_02:ev002", "dawn_view_02:ev003"] script: - ls -lrth * - ls -lrth images/* diff --git a/views/view3.yml b/views/view3.yml index 69f1187..fc42041 100644 --- a/views/view3.yml +++ b/views/view3.yml @@ -2,6 +2,10 @@ dawn_view_03:detector: extends: .views script: - ./bin/make_dawn_views -t view02 -d scripts/view2 -D +dawn_view_03:ev001: + extends: .views + script: + - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1 dawn_view_03:ev002: extends: .views script: @@ -10,7 +14,7 @@ dawn_view_03:ev002: view_03: stage: test needs: - - ["dawn_view_03:detector", "dawn_view_03:ev002"] + - ["dawn_view_03:detector", "dawn_view_03:ev001", "dawn_view_03:ev002"] script: - ls -lrth * - ls -lrth images/* diff --git a/views/view6.yml b/views/view6.yml index f0fda5c..8193641 100644 --- a/views/view6.yml +++ b/views/view6.yml @@ -2,6 +2,18 @@ dawn_view_06:detector: extends: .views script: - ./bin/make_dawn_views -t view02 -d scripts/view2 -D +dawn_view_06:ev001: + extends: .views + script: + - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1 +dawn_view_06:ev002: + extends: .views + script: + - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2 +dawn_view_06:ev003: + extends: .views + script: + - ./bin/make_dawn_views -t view02_ev003 -d scripts/view2 -s 3 dawn_view_06:ev004: extends: .views script: @@ -10,7 +22,7 @@ dawn_view_06:ev004: view_06: stage: test needs: - - ["dawn_view_06:detector", "dawn_view_06:ev004"] + - ["dawn_view_06:detector", "dawn_view_06:ev001", "dawn_view_06:ev002", "dawn_view_06:ev003", "dawn_view_06:ev004"] script: - ls -lrth * - ls -lrth images/* -- GitLab From 539bb0052b913c7216104cb24cd165acfdac8056 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong Date: Tue, 16 Mar 2021 11:55:19 -0500 Subject: [PATCH 2/2] modified: .gitlab-ci.yml modified: views/config.yml new file: views/view11.yml new file: views/view12.yml new file: views/view13.yml new file: views/view14.yml --- .gitlab-ci.yml | 10 +++++++- views/config.yml | 61 ++++-------------------------------------------- views/view11.yml | 33 ++++++++++++++++++++++++++ views/view12.yml | 13 +++++++++++ views/view13.yml | 13 +++++++++++ views/view14.yml | 13 +++++++++++ 6 files changed, 85 insertions(+), 58 deletions(-) create mode 100644 views/view11.yml create mode 100644 views/view12.yml create mode 100644 views/view13.yml create mode 100644 views/view14.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 258e483..b2193f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,7 +67,11 @@ include: - local: 'views/view3.yml' - local: 'views/view6.yml' - local: 'views/view7.yml' - - local: 'views/config.yml' + - local: 'views/view11.yml' + - local: 'views/view12.yml' + - local: 'views/view13.yml' + - local: 'views/view14.yml' + # - local: 'views/config.yml' report: stage: finalize @@ -77,6 +81,10 @@ report: - view_03 - view_06 - view_07 + - view_11 + - view_12 + - view_13 + - view_14 artifacts: paths: - images/ diff --git a/views/config.yml b/views/config.yml index 1004a27..2650bcc 100644 --- a/views/config.yml +++ b/views/config.yml @@ -1,61 +1,8 @@ - -#dawn_view_03:detector: +#dawn_view_13:detector: # extends: .views # script: -# - ./bin/make_dawn_views -t view03 -d scripts/view3 -D -#dawn_view_03:ev001: +# - ./bin/make_dawn_views -t view13 -d scripts/view13 -D +#dawn_view_14:detector: # 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 +# - ./bin/make_dawn_views -t view14 -d scripts/view14 -D diff --git a/views/view11.yml b/views/view11.yml new file mode 100644 index 0000000..a1cdf19 --- /dev/null +++ b/views/view11.yml @@ -0,0 +1,33 @@ +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 + +view_11: + stage: test + needs: + - ["dawn_view_11:detector","dawn_view_11:ev001","dawn_view_11:ev002", "dawn_view_11:ev003","dawn_view_11:ev004"] + script: + - ls -lrth * + - ls -lrth images/* + diff --git a/views/view12.yml b/views/view12.yml new file mode 100644 index 0000000..06755dd --- /dev/null +++ b/views/view12.yml @@ -0,0 +1,13 @@ +dawn_view_12:detector: + extends: .views + script: + - ./bin/make_dawn_views -t view12 -d scripts/view12 -D + +view_12: + stage: test + needs: + - ["dawn_view_12:detector"] + script: + - ls -lrth * + - ls -lrth images/* + diff --git a/views/view13.yml b/views/view13.yml new file mode 100644 index 0000000..573a013 --- /dev/null +++ b/views/view13.yml @@ -0,0 +1,13 @@ +dawn_view_13:detector: + extends: .views + script: + - ./bin/make_dawn_views -t view13 -d scripts/view13 -D + +view_13: + stage: test + needs: + - ["dawn_view_13:detector"] + script: + - ls -lrth * + - ls -lrth images/* + diff --git a/views/view14.yml b/views/view14.yml new file mode 100644 index 0000000..e0b647b --- /dev/null +++ b/views/view14.yml @@ -0,0 +1,13 @@ +dawn_view_14:detector: + extends: .views + script: + - ./bin/make_dawn_views -t view14 -d scripts/view14 -D + +view_14: + stage: test + needs: + - ["dawn_view_14:detector"] + script: + - ls -lrth * + - ls -lrth images/* + -- GitLab