Merge branch 'master' into chore/apply_202501_to_qa-niaid_planx-pla_n…

…et_1736364670
uc-cdis · Feb 7, 2025 · 99f058d · 99f058d
2 parents b85fac1 + 46ef628
commit 99f058d
Show file tree

Hide file tree

Showing 26 changed files with 1,203 additions and 410 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -90,6 +90,10 @@
     {
       "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
     },
+    {
+      "path": "detect_secrets.filters.common.is_baseline_file",
+      "filename": ".secrets.baseline"
+    },
     {
       "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
       "min_level": 2
@@ -152,21 +156,21 @@
         "filename": "jenkins-blood.planx-pla.net/manifest.json",
         "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 73
+        "line_number": 75
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-blood.planx-pla.net/manifest.json",
         "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 241
+        "line_number": 243
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-blood.planx-pla.net/manifest.json",
         "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 247
+        "line_number": 249
       }
     ],
     "jenkins-brain.planx-pla.net/manifest.json": [
@@ -175,21 +179,21 @@
         "filename": "jenkins-brain.planx-pla.net/manifest.json",
         "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 87
+        "line_number": 89
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-brain.planx-pla.net/manifest.json",
         "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 255
+        "line_number": 257
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-brain.planx-pla.net/manifest.json",
         "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 261
+        "line_number": 263
       }
     ],
     "jenkins-dcp.planx-pla.net/manifest.json": [
@@ -198,21 +202,21 @@
         "filename": "jenkins-dcp.planx-pla.net/manifest.json",
         "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 83
+        "line_number": 85
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-dcp.planx-pla.net/manifest.json",
         "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 251
+        "line_number": 253
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-dcp.planx-pla.net/manifest.json",
         "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 257
+        "line_number": 259
       }
     ],
     "jenkins-genomel.planx-pla.net/manifest.json": [
@@ -221,21 +225,21 @@
         "filename": "jenkins-genomel.planx-pla.net/manifest.json",
         "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 91
+        "line_number": 93
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-genomel.planx-pla.net/manifest.json",
         "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 259
+        "line_number": 261
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-genomel.planx-pla.net/manifest.json",
         "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 265
+        "line_number": 267
       }
     ],
     "jenkins-new-1.planx-pla.net/manifest.json": [
@@ -359,21 +363,21 @@
         "filename": "jenkins-niaid.planx-pla.net/manifest.json",
         "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 93
+        "line_number": 95
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-niaid.planx-pla.net/manifest.json",
         "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 261
+        "line_number": 263
       },
       {
         "type": "Secret Keyword",
         "filename": "jenkins-niaid.planx-pla.net/manifest.json",
         "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 267
+        "line_number": 269
       }
     ],
     "qa-anvil.planx-pla.net/manifest.json": [
@@ -7649,5 +7653,5 @@
       }
     ]
   },
-  "generated_at": "2024-12-05T15:56:25Z"
+  "generated_at": "2025-01-22T20:11:57Z"
 }
diff --git a/jenkins-blood.planx-pla.net/etlMapping.yaml b/jenkins-blood.planx-pla.net/etlMapping.yaml
@@ -161,4 +161,4 @@ mappings:
             fn: set
           - name: phenotype_group
             src: phenotype_group
-            fn: set
+            fn: set
diff --git a/jenkins-blood.planx-pla.net/manifest.json b/jenkins-blood.planx-pla.net/manifest.json
@@ -32,7 +32,9 @@
     "dashboard": "quay.io/cdis/gen3-statics:master",
     "requestor": "quay.io/cdis/requestor:master",
     "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
-    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master",
+    "ohif-viewer": "quay.io/cdis/ohif-viewer:gen3-v3.8.0",
+    "orthanc": "docker.io/osimis/orthanc:master"
   },
   "sower": [
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,4 +161,4 @@ mappings: @@
                 fn: set
               - name: phenotype_group
                 src: phenotype_group
-                fn: set
+                fn: set