Merge branch 'master' into heal_docupdate

uc-cdis · Jul 11, 2022 · 84542ba · 84542ba
2 parents 8de034f + 8ef8c69
commit 84542ba
Show file tree

Hide file tree

Showing 53 changed files with 1,127,715 additions and 945 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": null,
     "lines": null
   },
-  "generated_at": "2022-06-02T16:55:43Z",
+  "generated_at": "2022-07-11T14:16:59Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -102,7 +102,7 @@
       {
         "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
         "is_verified": false,
-        "line_number": 53,
+        "line_number": 59,
         "type": "Secret Keyword"
       }
     ],
@@ -142,7 +142,7 @@
       {
         "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
         "is_verified": false,
-        "line_number": 266,
+        "line_number": 145,
         "type": "Secret Keyword"
       }
     ],

diff --git a/jenkins-blood.planx-pla.net/manifest.json b/jenkins-blood.planx-pla.net/manifest.json
@@ -305,6 +305,22 @@
       {
         "index": "jenkins_cmc_alias",
         "type": "clinical_trials"
+      },
+      {
+        "index": "midrc_dataset",
+        "type": "dataset"
+      },
+      {
+        "index": "midrc_case",
+        "type": "case"
+      },
+      {
+        "index": "midrc_imaging_data_file",
+        "type": "imaging_data_file"
+      },
+      {
+        "index": "midrc_imaging_study",
+        "type": "imaging_study"
       }
     ],    
     "config_index": "jenkins_configs_alias",

diff --git a/jenkins-brain.planx-pla.net/manifest.json b/jenkins-brain.planx-pla.net/manifest.json
@@ -304,6 +304,22 @@
       {
         "index": "jenkins_cmc_alias",
         "type": "clinical_trials"
+      },
+      {
+        "index": "midrc_dataset",
+        "type": "dataset"
+      },
+      {
+        "index": "midrc_case",
+        "type": "case"
+      },
+      {
+        "index": "midrc_imaging_data_file",
+        "type": "imaging_data_file"
+      },
+      {
+        "index": "midrc_imaging_study",
+        "type": "imaging_study"
       }
     ],
     "config_index": "jenkins_configs_alias",

diff --git a/jenkins-dcp.planx-pla.net/manifest.json b/jenkins-dcp.planx-pla.net/manifest.json
@@ -298,6 +298,22 @@
       {
         "index": "jenkins_cmc_alias",
         "type": "clinical_trials"
+      },
+      {
+        "index": "midrc_dataset",
+        "type": "dataset"
+      },
+      {
+        "index": "midrc_case",
+        "type": "case"
+      },
+      {
+        "index": "midrc_imaging_data_file",
+        "type": "imaging_data_file"
+      },
+      {
+        "index": "midrc_imaging_study",
+        "type": "imaging_study"
       }
     ],
     "config_index": "jenkins_configs_alias",

diff --git a/jenkins-genomel.planx-pla.net/manifest.json b/jenkins-genomel.planx-pla.net/manifest.json
@@ -306,6 +306,22 @@
       {
         "index": "jenkins_cmc_alias",
         "type": "clinical_trials"
+      },
+      {
+        "index": "midrc_dataset",
+        "type": "dataset"
+      },
+      {
+        "index": "midrc_case",
+        "type": "case"
+      },
+      {
+        "index": "midrc_imaging_data_file",
+        "type": "imaging_data_file"
+      },
+      {
+        "index": "midrc_imaging_study",
+        "type": "imaging_study"
       }
     ],
     "config_index": "jenkins_configs_alias",

diff --git a/jenkins-new.planx-pla.net/manifest.json b/jenkins-new.planx-pla.net/manifest.json
@@ -298,6 +298,22 @@
       {
         "index": "jenkins_cmc_alias",
         "type": "clinical_trials"
+      },
+      {
+        "index": "midrc_dataset",
+        "type": "dataset"
+      },
+      {
+        "index": "midrc_case",
+        "type": "case"
+      },
+      {
+        "index": "midrc_imaging_data_file",
+        "type": "imaging_data_file"
+      },
+      {
+        "index": "midrc_imaging_study",
+        "type": "imaging_study"
       }
     ],
     "config_index": "jenkins_configs_alias",

diff --git a/jenkins-new.planx-pla.net/manifests/hatchery/hatchery.json b/jenkins-new.planx-pla.net/manifests/hatchery/hatchery.json
@@ -2,10 +2,16 @@
   "user-namespace": "jupyter-pods-jenkins-new",
   "sub-dir": "/lw-workspace",
   "user-volume-size": "512Mi",
+  "default-pay-model": {
+    "bmh_workspace_id": "blanket_billing_eks",
+    "region": "us-east-1",
+    "account_id": "707767160287",
+    "workspace_type": "qaplanetv1"
+  },
   "sidecar": {
     "cpu-limit": "1.0",
     "memory-limit": "256Mi",
-    "image": "quay.io/cdis/gen3fuse-sidecar:chore_sidecar",
+    "image": "quay.io/cdis/ecs-ws-sidecar:master",
     "env": {
       "NAMESPACE": "jenkins-new",
       "HOSTNAME": "jenkins-new.planx-pla.net"

diff --git a/jenkins-niaid.planx-pla.net/manifest.json b/jenkins-niaid.planx-pla.net/manifest.json
@@ -308,6 +308,22 @@
       {
         "index": "jenkins_cmc_alias",
         "type": "clinical_trials"
+      },
+      {
+        "index": "midrc_dataset",
+        "type": "dataset"
+      },
+      {
+        "index": "midrc_case",
+        "type": "case"
+      },
+      {
+        "index": "midrc_imaging_data_file",
+        "type": "imaging_data_file"
+      },
+      {
+        "index": "midrc_imaging_study",
+        "type": "imaging_study"
       }
     ],
     "config_index": "jenkins_configs_alias",