Merge branch 'master' into feat/GPE-1163

uc-cdis · Dec 15, 2023 · bd6bec8 · bd6bec8
2 parents 0aaa251 + aec26e2
commit bd6bec8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/qa-brh.planx-pla.net/manifest.json b/qa-brh.planx-pla.net/manifest.json
@@ -13,7 +13,7 @@
     "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.12",
     "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.12",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
-    "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.12",
+    "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:feat_nextflow-config",
     "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.12",
     "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.0",
     "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.12",
@@ -92,4 +92,4 @@
       "targetCpu": 40
     }
   }
-}
+}
diff --git a/qa-brh.planx-pla.net/manifests/hatchery/hatchery.json b/qa-brh.planx-pla.net/manifests/hatchery/hatchery.json
@@ -11,7 +11,7 @@
   "sidecar": {
     "cpu-limit": "1.0",
     "memory-limit": "256Mi",
-    "image": "quay.io/cdis/ecs-ws-sidecar:2023.12",
+    "image": "quay.io/cdis/ecs-ws-sidecar:feat_nextflow-file",
     "env": {
       "NAMESPACE": "qa-brh",
       "HOSTNAME": "qa-brh.planx-pla.net"
@@ -104,13 +104,13 @@
       "cpu-limit": "4.0",
       "memory-limit": "10Gi",
       "name": "(Nextflow) Test Nextflow in qa-brh",
-      "image": "quay.io/cdis/jupyter-notebook:nextflow-master",
+      "image": "quay.io/cdis/jupyter-notebook:nextflow-feat_nextflow-welcome",
       "env": {
         "FRAME_ANCESTORS": "https://qa-brh.planx-pla.net"
       },
       "args": [
         "--NotebookApp.base_url=/lw-workspace/proxy/",
-        "--NotebookApp.default_url=/lab",
+        "--LabApp.default_url=/lab/tree/nextflow-welcome.html",
         "--NotebookApp.password=''",
         "--NotebookApp.token=''",
         "--NotebookApp.shutdown_no_activity_timeout=5400",
@@ -122,11 +122,6 @@
       "path-rewrite": "/lw-workspace/proxy/",
       "use-tls": "false",
       "ready-probe": "/lw-workspace/proxy/",
-      "lifecycle-post-start": [
-        "/bin/sh",
-        "-c",
-        "export IAM=`whoami`; rm -rf /home/$IAM/pd/dockerHome; rm -rf /home/$IAM/pd/lost+found; ln -s /data /home/$IAM/pd/; true"
-      ],
       "user-uid": 1000,
       "fs-gid": 100,
       "user-volume-location": "/home/jovyan/pd",
@@ -161,4 +156,4 @@
       }
     }
   ]
-}
+}
diff --git a/qa-heal.planx-pla.net/manifest.json b/qa-heal.planx-pla.net/manifest.json
@@ -75,7 +75,7 @@
       "activeDeadlineSeconds": 600,
       "container": {
         "name": "job-task",
-        "image": "quay.io/cdis/batch-export:2023.12",
+        "image": "quay.io/cdis/batch-export:4.0.2",
         "pull_policy": "Always",
         "env": [
           {

diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json
@@ -10,10 +10,7 @@
     "ambassador": "quay.io/datawire/ambassador:1.14.4",
     "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.12",
     "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:master",
-    "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2023.12",
-    "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:master",
-    "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.12",
-    "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.12",
+    "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:feat_team_project_feature",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
     "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.12",
     "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.12",

diff --git a/qa-mickey.planx-pla.net/portal/gitops.json b/qa-mickey.planx-pla.net/portal/gitops.json
@@ -110,6 +110,13 @@
       "description": "Use this App to view status & results of submitted workflows",
       "image": "/src/img/analysis-icons/gwasResults.svg",
       "needsTeamProject": true
+    },
+    {
+      "appId": "DataDictionary",
+      "title": "Data Dictionary",
+      "description": "Use this App to view a tabluar representation of the data dictionary",
+      "image": "/src/img/analysis-icons/default-app.png",
+      "needsTeamProject": false
     }
   ],
   "showArboristAuthzOnProfile": false,