From 0a366c60352725e765be6beb70eab6d0943bd362 Mon Sep 17 00:00:00 2001
From: Roy de Goei <goei@astron.nl>
Date: Thu, 8 Sep 2022 16:54:25 +0200
Subject: [PATCH] SDC-679: Fix in dockernames of lofar-legacy and
 lofar-ms-software

---
 README.md                              | 4 ++--
 steps/extract_sip_meta.cwl             | 2 +-
 steps/fix_antenna_information_2013.cwl | 2 +-
 steps/fix_antenna_information_2015.cwl | 2 +-
 steps/fix_long_baselines.cwl           | 2 +-
 steps/fix_weightissue_flagging.cwl     | 2 +-
 steps/identify_issues.cwl              | 2 +-
 steps/inspect_flagging_dataloss.cwl    | 2 +-
 steps/plot_uvw_coverage.cwl            | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 6e61828..4a53dbb 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,8 @@ This workflow is used by the LDV framework.
 
 ## Docker images
 
-- git.astron.nl:5000/ldv-images/lofar-legacy:latest
-- git.astron.nl:5000/ldv-images/lofar-ms-software:latest
+- git.astron.nl:5000/ldv/ldv-images/lofar-legacy:latest
+- git.astron.nl:5000/ldv/ldv-images/lofar-ms-software:latest
 Docker images will be fetched the first time the workflow is used and be converted into a singularity image (sif file)
 
 ## Running the workflow
diff --git a/steps/extract_sip_meta.cwl b/steps/extract_sip_meta.cwl
index c574783..645d556 100644
--- a/steps/extract_sip_meta.cwl
+++ b/steps/extract_sip_meta.cwl
@@ -26,7 +26,7 @@ outputs:
 label: inspect_flagging_dataloss
 hints:
   - class: DockerRequirement
-    dockerPull: 'git.astron.nl:5000/ldv-images/lofar-ms-software:latest'
+    dockerPull: git.astron.nl:5000/ldv/ldv-images/lofar-ms-software:latest
   - class: NetworkAccess
     networkAccess: true
 
diff --git a/steps/fix_antenna_information_2013.cwl b/steps/fix_antenna_information_2013.cwl
index 07692a8..7dde512 100644
--- a/steps/fix_antenna_information_2013.cwl
+++ b/steps/fix_antenna_information_2013.cwl
@@ -37,6 +37,6 @@ requirements:
     inplaceUpdate: true
 hints:
   - class: DockerRequirement
-    dockerPull: "git.astron.nl:5000/ldv-images/lofar-legacy:latest"
+    dockerPull: git.astron.nl:5000/ldv/ldv-images/lofar-legacy:latest
   - class: NetworkAccess
     networkAccess: true
\ No newline at end of file
diff --git a/steps/fix_antenna_information_2015.cwl b/steps/fix_antenna_information_2015.cwl
index 5f190f9..9145d69 100644
--- a/steps/fix_antenna_information_2015.cwl
+++ b/steps/fix_antenna_information_2015.cwl
@@ -40,6 +40,6 @@ requirements:
     inplaceUpdate: true
 hints:
   - class: DockerRequirement
-    dockerPull: "git.astron.nl:5000/ldv-images/lofar-legacy:latest"
+    dockerPull: git.astron.nl:5000/ldv/ldv-images/lofar-legacy:latest
   - class: NetworkAccess
     networkAccess: true
\ No newline at end of file
diff --git a/steps/fix_long_baselines.cwl b/steps/fix_long_baselines.cwl
index 26184e6..400b43b 100644
--- a/steps/fix_long_baselines.cwl
+++ b/steps/fix_long_baselines.cwl
@@ -42,6 +42,6 @@ outputs:
 
 hints:
   - class: DockerRequirement
-    dockerPull: "git.astron.nl:5000/ldv-images/lofar-legacy:latest"
+    dockerPull: git.astron.nl:5000/ldv/ldv-images/lofar-legacy:latest"
   - class: NetworkAccess
     networkAccess: true
\ No newline at end of file
diff --git a/steps/fix_weightissue_flagging.cwl b/steps/fix_weightissue_flagging.cwl
index 36772d5..3aef8e9 100644
--- a/steps/fix_weightissue_flagging.cwl
+++ b/steps/fix_weightissue_flagging.cwl
@@ -35,6 +35,6 @@ outputs:
       glob: $(inputs.msin.basename)
 hints:
   - class: DockerRequirement
-    dockerPull: "git.astron.nl:5000/ldv-images/lofar-legacy:latest"
+    dockerPull: git.astron.nl:5000/ldv/ldv-images/lofar-legacy:latest
   - class: NetworkAccess
     networkAccess: true
\ No newline at end of file
diff --git a/steps/identify_issues.cwl b/steps/identify_issues.cwl
index 2e833bc..fc3ab14 100644
--- a/steps/identify_issues.cwl
+++ b/steps/identify_issues.cwl
@@ -4,7 +4,7 @@ class: CommandLineTool
 cwlVersion: v1.0
 hints:
   - class: DockerRequirement
-    dockerPull: git.astron.nl:5000/ldv-images/lofar-legacy:latest
+    dockerPull: git.astron.nl:5000/ldv/ldv-images/lofar-legacy:latest
   - class: NetworkAccess
     networkAccess: true
 inputs:
diff --git a/steps/inspect_flagging_dataloss.cwl b/steps/inspect_flagging_dataloss.cwl
index 9a20888..578d7f1 100644
--- a/steps/inspect_flagging_dataloss.cwl
+++ b/steps/inspect_flagging_dataloss.cwl
@@ -128,6 +128,6 @@ requirements:
 
 
   - class: DockerRequirement
-    dockerPull: 'git.astron.nl:5000/ldv-images/lofar-ms-software:latest'
+    dockerPull: git.astron.nl:5000/ldv/ldv-images/lofar-ms-software:latest
   - class: NetworkAccess
     networkAccess: true
\ No newline at end of file
diff --git a/steps/plot_uvw_coverage.cwl b/steps/plot_uvw_coverage.cwl
index 767cb3f..fa0c973 100644
--- a/steps/plot_uvw_coverage.cwl
+++ b/steps/plot_uvw_coverage.cwl
@@ -20,7 +20,7 @@ outputs:
       glob: $(inputs.output_name)
 hints:
   - class: DockerRequirement
-    dockerPull: git.astron.nl:5000/ldv-images/lofar-ms-software
+    dockerPull: git.astron.nl:5000/ldv/ldv-images/lofar-ms-software
   - class: NetworkAccess
     networkAccess: true
 
-- 
GitLab