From fd89b5f457d15a83edf7a94bb9a3646a1112ddeb Mon Sep 17 00:00:00 2001 From: Marcelo R Costa Date: Fri, 9 Jul 2021 10:41:15 -0500 Subject: [PATCH 1/4] apply version 2021.07 to qa-covid19.planx-pla.net --- qa-covid19.planx-pla.net/manifest.json | 58 +++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/qa-covid19.planx-pla.net/manifest.json b/qa-covid19.planx-pla.net/manifest.json index b6c76941f..27dd6a4b0 100644 --- a/qa-covid19.planx-pla.net/manifest.json +++ b/qa-covid19.planx-pla.net/manifest.json @@ -4,33 +4,33 @@ "That's all I have to say" ], "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2021.04", - "augur": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-augur:fix_docker2", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2021.04", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2021.07", + "augur": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-augur:2021.07", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2021.07", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "covid19-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-etl:4.8.2", - "covid19-notebook-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-notebook-etl:4.7.6", - "covid19-bayes-model": "quay.io/cdis/covid19-bayes-model:3.4.3", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:4.29.1", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2021.04", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2021.04", - "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2021.04", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2021.04", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2021.04", - "portal": "quay.io/cdis/data-portal:feat_WLSmapDataOverlays", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:0.5.0", + "covid19-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-etl:2021.07", + "covid19-notebook-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-notebook-etl:2021.07", + "covid19-bayes-model": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-bayes-model:2021.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2021.07", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2021.07", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2021.07", + "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2021.07", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2021.07", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2021.07", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2021.07", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2021.07", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2021.04", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:0.1.5", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2021.04", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2021.04", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2021.07", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2021.07", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2021.07", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2021.07", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:0.13.0", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2021.04", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2021.07", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2021.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2021.04", - "auspice": "quay.io/cdis/gen3-auspice:v2.25.gen3.2.3", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2021.04", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2021.04" + "auspice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/auspice:2021.07", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2021.07", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2021.07" }, "global": { "environment": "qa-covid19", @@ -63,16 +63,16 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "quay.io/cdis/indexs3client:2021.04" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2021.07" } }, - "sower" : [ + "sower": [ { "name": "pelican-export", "action": "export", "container": { "name": "job-task", - "image": "quay.io/cdis/pelican-export:2021.04", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2021.07", "pull_policy": "Always", "env": [ { @@ -149,7 +149,7 @@ "serviceAccountName": "jobs-qa-covid19-planx-pla-net", "container": { "name": "job-task", - "image": "quay.io/cdis/manifest-indexing:2021.04", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2021.07", "pull_policy": "Always", "env": [ { @@ -189,7 +189,7 @@ "serviceAccountName": "jobs-qa-covid19-planx-pla-net", "container": { "name": "job-task", - "image": "quay.io/cdis/download-indexd-manifest:2021.04", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2021.07", "pull_policy": "Always", "env": [ { @@ -353,4 +353,4 @@ } } } -} +} \ No newline at end of file From 618ab63b512dd7c797c714ee6479ad9a7a030a22 Mon Sep 17 00:00:00 2001 From: Marcelo R Costa Date: Fri, 9 Jul 2021 10:41:15 -0500 Subject: [PATCH 2/4] apply version 2021.07 to qa-covid19.planx-pla.net --- .../manifests/hatchery/hatchery.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/qa-covid19.planx-pla.net/manifests/hatchery/hatchery.json b/qa-covid19.planx-pla.net/manifests/hatchery/hatchery.json index 76dd9a906..170a10075 100644 --- a/qa-covid19.planx-pla.net/manifests/hatchery/hatchery.json +++ b/qa-covid19.planx-pla.net/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2021.04", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2021.07", "env": { "NAMESPACE": "qa-covid19", "HOSTNAME": "qa-covid19.planx-pla.net" @@ -106,10 +106,12 @@ { "name": "firefox", "image": "quay.io/cdis/docker-firefox:v1.13.0_ctds.1.0.0", - "volumeMounts": [{ - "name": "dshm", - "mountPath": "/dev/shm" - }], + "volumeMounts": [ + { + "name": "dshm", + "mountPath": "/dev/shm" + } + ], "securityContext": { "privileged": true }, @@ -146,4 +148,4 @@ "name": "A collection of Jupyter notebooks to explore health outcomes for COVID-19" } ] -} +} \ No newline at end of file From 059be4f843cb20d78b18fb9e882168f27c7fb7f3 Mon Sep 17 00:00:00 2001 From: Atharva Rane Date: Mon, 12 Jul 2021 14:32:24 -0500 Subject: [PATCH 3/4] fixing the versions and urls --- qa-covid19.planx-pla.net/manifest.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/qa-covid19.planx-pla.net/manifest.json b/qa-covid19.planx-pla.net/manifest.json index 9d878ebb2..0ea565ac4 100644 --- a/qa-covid19.planx-pla.net/manifest.json +++ b/qa-covid19.planx-pla.net/manifest.json @@ -5,12 +5,11 @@ ], "versions": { "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2021.07", - "augur": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-augur:2021.07", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2021.07", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8", - "covid19-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-etl:2021.07", - "covid19-notebook-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-notebook-etl:2021.07", - "covid19-bayes-model": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-bayes-model:2021.07", + "covid19-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-etl:4.8.2", + "covid19-notebook-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-notebook-etl:4.7.6", + "covid19-bayes-model": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-bayes-model:3.4.3", "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2021.07", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2021.07", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2021.07", @@ -28,7 +27,7 @@ "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2021.07", "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2021.07", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2021.07", - "auspice": "quay.io/cdis/gen3-auspice:v2.25.gen3.2.5", + "auspice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-auspice:v2.25.gen3.2.5", "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2021.07", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2021.07" }, @@ -353,4 +352,4 @@ } } } -} \ No newline at end of file +} From 10a160cd63ea434b54f12c9b0be5ac0c2b178d27 Mon Sep 17 00:00:00 2001 From: Atharva Rane Date: Mon, 12 Jul 2021 16:53:22 -0500 Subject: [PATCH 4/4] change the fence version --- qa-covid19.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-covid19.planx-pla.net/manifest.json b/qa-covid19.planx-pla.net/manifest.json index 0ea565ac4..6199c8a3b 100644 --- a/qa-covid19.planx-pla.net/manifest.json +++ b/qa-covid19.planx-pla.net/manifest.json @@ -10,7 +10,7 @@ "covid19-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-etl:4.8.2", "covid19-notebook-etl": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-notebook-etl:4.7.6", "covid19-bayes-model": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/covid19-bayes-model:3.4.3", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2021.07", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:5.3.1", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2021.07", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2021.07", "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2021.07",