Merge branch 'master' into chore/apply_integration202503_to_qa-heal_p…

…lanx-pla_net_1739801960
uc-cdis · Feb 24, 2025 · f9203ab · f9203ab
2 parents ec19659 + a6b290b
commit f9203ab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/qa-jcoin.planx-pla.net/manifests/hatchery/hatchery.json b/qa-jcoin.planx-pla.net/manifests/hatchery/hatchery.json
@@ -25,22 +25,6 @@
     ]
   },
   "containers": [
-    {
-      "target-port": 8787,
-      "cpu-limit": "1.0",
-      "memory-limit": "1024Mi",
-      "name": "RStudio 4.1.0",
-      "image": "quay.io/cdis/rstudio4.1:rstudio4.1-0.1.0",
-      "env": {
-        "DISABLE_AUTH": "true"
-      },
-      "args": [],
-      "path-rewrite": "/",
-      "use-tls": "false",
-      "ready-probe": "/",
-      "user-volume-location": "/home/rstudio/pd",
-      "fs-gid": 100
-    },
     {
       "target-port": 8888,
       "cpu-limit": "1.0",

diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json
@@ -20,7 +20,7 @@
     "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01",
     "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2025.01",
     "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2025.01",
-    "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:feat_enable_cohort_characterization",
+    "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:feat_VADC-1600",
     "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:2.15.0-DEV",
     "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2025.01",
     "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:feat_add_transformation_and_filters_to_remaining_frontend_parts",