From 9fd2fa9b79a6aa319b868ea6953e9c8bd5cc8f23 Mon Sep 17 00:00:00 2001 From: vzpgb <45467497+vzpgb@users.noreply.github.com> Date: Thu, 3 Oct 2024 13:39:48 -0500 Subject: [PATCH 1/9] Update argo template in qa-mickey --- qa-mickey.planx-pla.net/portal/gitops.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/portal/gitops.json b/qa-mickey.planx-pla.net/portal/gitops.json index d9c9b9020..9ea29849d 100644 --- a/qa-mickey.planx-pla.net/portal/gitops.json +++ b/qa-mickey.planx-pla.net/portal/gitops.json @@ -1,6 +1,6 @@ { "gaTrackingId": "UA-119127212-3", - "argoTemplate": "gwas-template-cohort-definition", + "argoTemplate": "gwas-template-database-version", "graphql": { "boardCounts": [], "chartCounts": [], From a94b8f5f3005fd7f81dbe105d781857d2ff0be53 Mon Sep 17 00:00:00 2001 From: BinamB Date: Tue, 8 Oct 2024 10:32:09 -0500 Subject: [PATCH 2/9] Update Indexd to latest versio --- qa-niaid.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-niaid.planx-pla.net/manifest.json b/qa-niaid.planx-pla.net/manifest.json index d54b63795..91f53a726 100644 --- a/qa-niaid.planx-pla.net/manifest.json +++ b/qa-niaid.planx-pla.net/manifest.json @@ -12,7 +12,7 @@ "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.08", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.08", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:5.1.1", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.08", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.08", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.08", From 34f27893554892bbf9de68ce9bb86fd7df945044 Mon Sep 17 00:00:00 2001 From: Hara Prasad Date: Tue, 8 Oct 2024 13:35:32 -0500 Subject: [PATCH 3/9] Use separate user.yaml for CI (#3026) --- jenkins-brain.planx-pla.net/manifest.json | 2 +- jenkins-dcp.planx-pla.net/manifest.json | 2 +- jenkins-genomel.planx-pla.net/manifest.json | 2 +- jenkins-new-1.planx-pla.net/manifest.json | 2 +- jenkins-new-2.planx-pla.net/manifest.json | 2 +- jenkins-new-3.planx-pla.net/manifest.json | 2 +- jenkins-new-4.planx-pla.net/manifest.json | 2 +- jenkins-new.planx-pla.net/manifest.json | 2 +- jenkins-niaid.planx-pla.net/manifest.json | 2 +- jenkins-perf.planx-pla.net/manifest.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jenkins-brain.planx-pla.net/manifest.json b/jenkins-brain.planx-pla.net/manifest.json index 668064a77..e6fa1c72b 100644 --- a/jenkins-brain.planx-pla.net/manifest.json +++ b/jenkins-brain.planx-pla.net/manifest.json @@ -277,7 +277,7 @@ "kube_bucket": "kube-qaplanetv1-gen3", "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "tier_access_level" : "libre", "es7": true diff --git a/jenkins-dcp.planx-pla.net/manifest.json b/jenkins-dcp.planx-pla.net/manifest.json index 71c5e6575..9f9a7ca14 100644 --- a/jenkins-dcp.planx-pla.net/manifest.json +++ b/jenkins-dcp.planx-pla.net/manifest.json @@ -273,7 +273,7 @@ "kube_bucket": "kube-qaplanetv1-gen3", "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "tier_access_level" : "libre", "es7": true diff --git a/jenkins-genomel.planx-pla.net/manifest.json b/jenkins-genomel.planx-pla.net/manifest.json index d30bf69d9..8fd3ef302 100644 --- a/jenkins-genomel.planx-pla.net/manifest.json +++ b/jenkins-genomel.planx-pla.net/manifest.json @@ -281,7 +281,7 @@ "kube_bucket": "kube-qaplanetv1-gen3", "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "tier_access_level" : "libre", "es7": true diff --git a/jenkins-new-1.planx-pla.net/manifest.json b/jenkins-new-1.planx-pla.net/manifest.json index e0c6be9c6..b5fe4207b 100644 --- a/jenkins-new-1.planx-pla.net/manifest.json +++ b/jenkins-new-1.planx-pla.net/manifest.json @@ -273,7 +273,7 @@ "kube_bucket": "kube-qaplanetv1-gen3", "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "tier_access_level" : "libre", "es7": true diff --git a/jenkins-new-2.planx-pla.net/manifest.json b/jenkins-new-2.planx-pla.net/manifest.json index 05f0a011f..f879b62b6 100644 --- a/jenkins-new-2.planx-pla.net/manifest.json +++ b/jenkins-new-2.planx-pla.net/manifest.json @@ -273,7 +273,7 @@ "kube_bucket": "kube-qaplanetv1-gen3", "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "tier_access_level" : "libre", "es7": true diff --git a/jenkins-new-3.planx-pla.net/manifest.json b/jenkins-new-3.planx-pla.net/manifest.json index 35b7b3b19..4b45e20bd 100644 --- a/jenkins-new-3.planx-pla.net/manifest.json +++ b/jenkins-new-3.planx-pla.net/manifest.json @@ -273,7 +273,7 @@ "kube_bucket": "kube-qaplanetv1-gen3", "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "tier_access_level" : "libre", "es7": true diff --git a/jenkins-new-4.planx-pla.net/manifest.json b/jenkins-new-4.planx-pla.net/manifest.json index 3f1e96b5b..ef87239f6 100644 --- a/jenkins-new-4.planx-pla.net/manifest.json +++ b/jenkins-new-4.planx-pla.net/manifest.json @@ -273,7 +273,7 @@ "kube_bucket": "kube-qaplanetv1-gen3", "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "tier_access_level" : "libre", "es7": true diff --git a/jenkins-new.planx-pla.net/manifest.json b/jenkins-new.planx-pla.net/manifest.json index 27af8700f..5b2e8b2b7 100644 --- a/jenkins-new.planx-pla.net/manifest.json +++ b/jenkins-new.planx-pla.net/manifest.json @@ -273,7 +273,7 @@ "kube_bucket": "kube-qaplanetv1-gen3", "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "tier_access_level" : "libre", "es7": true diff --git a/jenkins-niaid.planx-pla.net/manifest.json b/jenkins-niaid.planx-pla.net/manifest.json index ff3bfe0b0..463cd8135 100644 --- a/jenkins-niaid.planx-pla.net/manifest.json +++ b/jenkins-niaid.planx-pla.net/manifest.json @@ -284,7 +284,7 @@ "logs_bucket": "logs-qaplanetv1-gen3", "sync_from_dbgap": "True", "tier_access_level": "libre", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "dispatcher_job_num": "5", "es7": true }, diff --git a/jenkins-perf.planx-pla.net/manifest.json b/jenkins-perf.planx-pla.net/manifest.json index ffdfbff3b..c07792895 100644 --- a/jenkins-perf.planx-pla.net/manifest.json +++ b/jenkins-perf.planx-pla.net/manifest.json @@ -64,7 +64,7 @@ "sync_from_dbgap": "False", "kube_bucket": "kube_bucket.devplanetv1.gen3", "logs_bucket": "logs-devplanetv1-gen3", - "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", + "useryaml_s3path": "s3://cdis-gen3-users/ci/user.yaml", "es7": true }, "canary": { From 3d9c72857573961baffdf90202ffc28110a9b50c Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Wed, 9 Oct 2024 07:51:49 -0500 Subject: [PATCH 4/9] Update manifest.json (#3027) --- qa-heal.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-heal.planx-pla.net/manifest.json b/qa-heal.planx-pla.net/manifest.json index 8f0c35f2f..28e6fee3c 100644 --- a/qa-heal.planx-pla.net/manifest.json +++ b/qa-heal.planx-pla.net/manifest.json @@ -15,7 +15,7 @@ "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.10", "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.10", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "frontend-framework": "quay.io/cdis/frontend-framework:0.7.4", + "frontend-framework": "quay.io/cdis/frontend-framework:0.7.5", "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.10", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.10", "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.10", From 835da9bbfbceec09cf18d72fd182d5abcbd0bb4b Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:14:03 -0700 Subject: [PATCH 5/9] apply version 2024.10 to qa-jcoin.planx-pla.net --- qa-jcoin.planx-pla.net/manifest.json | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/qa-jcoin.planx-pla.net/manifest.json b/qa-jcoin.planx-pla.net/manifest.json index f0ca33041..383c66c4f 100644 --- a/qa-jcoin.planx-pla.net/manifest.json +++ b/qa-jcoin.planx-pla.net/manifest.json @@ -4,26 +4,26 @@ "That's all I have to say." ], "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.09", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.10", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", - "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.09", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.09", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.09", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.09", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.09", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.09", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.09", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.09", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.09", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.09", + "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2024.10", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.10", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.10", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.10", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.10", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.10", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.10", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.10", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.10", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.10", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.09", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.09", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.09", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.09", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.09", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.09", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.09", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.10", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.10", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.10", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.10", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.10", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.10", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.10", "ambassador": "quay.io/datawire/ambassador:1.4.2" }, "guppy": { @@ -75,7 +75,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.09" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.10" } }, "sower": [ @@ -86,7 +86,7 @@ "serviceAccountName": "jobs-qa-jcoin-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2024.09", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2024.10", "pull_policy": "Always", "env": [ { @@ -126,7 +126,7 @@ "serviceAccountName": "jobs-qa-jcoin-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2024.09", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2024.10", "pull_policy": "Always", "env": [], "volumeMounts": [ @@ -157,7 +157,7 @@ "serviceAccountName": "jobs-qa-jcoin-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.09", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.10", "pull_policy": "Always", "env": [ { @@ -198,7 +198,7 @@ "serviceAccountName": "jobs-qa-jcoin-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2024.09", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cdis/manifest-merging:2024.10", "pull_policy": "Always", "env": [ { @@ -239,7 +239,7 @@ "serviceAccountName": "jobs-qa-jcoin-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.09", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.10", "pull_policy": "Always", "env": [ { From aa29d8f1d9d0ccb527366e890b57e321bd9e4dc2 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:14:04 -0700 Subject: [PATCH 6/9] apply version 2024.10 to qa-jcoin.planx-pla.net --- qa-jcoin.planx-pla.net/manifests/hatchery/hatchery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-jcoin.planx-pla.net/manifests/hatchery/hatchery.json b/qa-jcoin.planx-pla.net/manifests/hatchery/hatchery.json index 7aeaaddfd..8e6cd33cf 100644 --- a/qa-jcoin.planx-pla.net/manifests/hatchery/hatchery.json +++ b/qa-jcoin.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:2024.09", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.10", "env": { "NAMESPACE": "qa-jcoin", "HOSTNAME": "qa-jcoin.planx-pla.net" From c2ed1a9ce341cab54cc221284ee784887eee4f38 Mon Sep 17 00:00:00 2001 From: Mingfei Shao <2475897+mfshao@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:26:55 -0500 Subject: [PATCH 7/9] deploy mixed icon (#3030) --- .secrets.baseline | 4 ++-- qa-heal.planx-pla.net/manifest.json | 2 +- qa-heal.planx-pla.net/portal/gitops.json | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 8d652ee10..8f9f89d08 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -6922,7 +6922,7 @@ "filename": "qa-heal.planx-pla.net/manifest.json", "hashed_secret": "ae4a2a671a528744059cd818de9af9e13005563b", "is_verified": false, - "line_number": 110 + "line_number": 109 } ], "qa-heal.planx-pla.net/metadata/aggregate_config.json": [ @@ -7620,5 +7620,5 @@ } ] }, - "generated_at": "2024-08-21T20:16:57Z" + "generated_at": "2024-10-10T16:16:01Z" } diff --git a/qa-heal.planx-pla.net/manifest.json b/qa-heal.planx-pla.net/manifest.json index 28e6fee3c..89af97a35 100644 --- a/qa-heal.planx-pla.net/manifest.json +++ b/qa-heal.planx-pla.net/manifest.json @@ -21,7 +21,7 @@ "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.10", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.10", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.10", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.34.0", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:feat_mixed-avail-icons", "requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.10", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.10", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.10", diff --git a/qa-heal.planx-pla.net/portal/gitops.json b/qa-heal.planx-pla.net/portal/gitops.json index 7e94e3908..e36a55711 100644 --- a/qa-heal.planx-pla.net/portal/gitops.json +++ b/qa-heal.planx-pla.net/portal/gitops.json @@ -231,6 +231,9 @@ "notAvailable": { "enabled": true, "menuText": "Not Available" + }, + "mixed": { + "enabled": true } } } From 2c163ba29964fd0d792c7d545d210b14ae02ba54 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Tue, 15 Oct 2024 07:03:07 -0700 Subject: [PATCH 8/9] Updating CI env with integration202411 qa-dcp.planx-pla.net 1728914217 (#3031) * apply version integration202411 to qa-dcp.planx-pla.net * apply version integration202411 to qa-dcp.planx-pla.net --- qa-dcp.planx-pla.net/manifest.json | 46 +++++++++---------- .../manifests/hatchery/hatchery.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qa-dcp.planx-pla.net/manifest.json b/qa-dcp.planx-pla.net/manifest.json index 672ccc37f..b0d5b04c9 100644 --- a/qa-dcp.planx-pla.net/manifest.json +++ b/qa-dcp.planx-pla.net/manifest.json @@ -7,25 +7,25 @@ "autodeploy": "yes" }, "versions": { - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.10", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:integration202411", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.10", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.10", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.10", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.10", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.10", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.10", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:integration202411", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:integration202411", + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:integration202411", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:integration202411", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:integration202411", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:integration202411", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2024.10", - "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2024.10", - "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2024.10", - "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2024.10", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.10", + "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:integration202411", + "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:integration202411", + "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:integration202411", + "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:integration202411", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:integration202411", "ambassador": "quay.io/datawire/ambassador:1.4.2", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.10", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.10", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.10", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.10" + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:integration202411", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:integration202411", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:integration202411", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:integration202411" }, "google": { "enabled": "yes" @@ -41,7 +41,7 @@ "serviceAccountName": "jobs-qa-dcp-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2024.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:integration202411", "pull_policy": "Always", "env": [ { @@ -81,7 +81,7 @@ "serviceAccountName": "jobs-qa-dcp-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2024.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:integration202411", "pull_policy": "Always", "env": [], "volumeMounts": [ @@ -111,7 +111,7 @@ "serviceAccountName": "jobs-qa-dcp-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2024.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:integration202411", "pull_policy": "Always", "env": [ { @@ -151,7 +151,7 @@ "serviceAccountName": "jobs-qa-dcp-planx-pla-net", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2024.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:integration202411", "pull_policy": "Always", "env": [ { @@ -190,7 +190,7 @@ "action": "export", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:integration202411", "pull_policy": "Always", "env": [ { @@ -254,7 +254,7 @@ "action": "export-files", "container": { "name": "job-task", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2024.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:integration202411", "pull_policy": "Always", "env": [ { @@ -320,7 +320,7 @@ ], "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.10" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:integration202411" } }, "global": { diff --git a/qa-dcp.planx-pla.net/manifests/hatchery/hatchery.json b/qa-dcp.planx-pla.net/manifests/hatchery/hatchery.json index e17aa964f..84d93eb00 100644 --- a/qa-dcp.planx-pla.net/manifests/hatchery/hatchery.json +++ b/qa-dcp.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:2024.10", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:integration202411", "env": { "NAMESPACE": "qa-dcp", "HOSTNAME": "qa-dcp.planx-pla.net" From 7e6dc3a408fd0c5f5b26e6ace1c5404b1f18b779 Mon Sep 17 00:00:00 2001 From: PlanXCyborg <38964842+PlanXCyborg@users.noreply.github.com> Date: Tue, 15 Oct 2024 07:03:24 -0700 Subject: [PATCH 9/9] Updating CI env with integration202411 jenkins-perf.planx-pla.net 1728914223 (#3032) * apply version integration202411 to jenkins-perf.planx-pla.net * apply version integration202411 to jenkins-perf.planx-pla.net --- jenkins-perf.planx-pla.net/manifest.json | 28 +++++++++---------- .../manifests/hatchery/hatchery.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jenkins-perf.planx-pla.net/manifest.json b/jenkins-perf.planx-pla.net/manifest.json index c07792895..7c8040f69 100644 --- a/jenkins-perf.planx-pla.net/manifest.json +++ b/jenkins-perf.planx-pla.net/manifest.json @@ -7,21 +7,21 @@ "autodeploy": "yes" }, "versions": { - "arborist": "quay.io/cdis/arborist:2024.10", + "arborist": "quay.io/cdis/arborist:integration202411", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1", - "fence": "quay.io/cdis/fence:2024.10", + "fence": "quay.io/cdis/fence:integration202411", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "indexd": "quay.io/cdis/indexd:2024.10", - "peregrine": "quay.io/cdis/peregrine:2024.10", - "portal": "quay.io/cdis/data-portal:2024.10", - "revproxy": "quay.io/cdis/nginx:2024.10", - "sheepdog": "quay.io/cdis/sheepdog:2024.10", - "manifestservice": "quay.io/cdis/manifestservice:2024.10", - "wts": "quay.io/cdis/workspace-token-service:2024.10", - "sower": "quay.io/cdis/sower:2024.10", - "hatchery": "quay.io/cdis/hatchery:2024.10", - "metadata": "quay.io/cdis/metadata-service:2024.10", - "dashboard": "quay.io/cdis/gen3-statics:2024.10" + "indexd": "quay.io/cdis/indexd:integration202411", + "peregrine": "quay.io/cdis/peregrine:integration202411", + "portal": "quay.io/cdis/data-portal:integration202411", + "revproxy": "quay.io/cdis/nginx:integration202411", + "sheepdog": "quay.io/cdis/sheepdog:integration202411", + "manifestservice": "quay.io/cdis/manifestservice:integration202411", + "wts": "quay.io/cdis/workspace-token-service:integration202411", + "sower": "quay.io/cdis/sower:integration202411", + "hatchery": "quay.io/cdis/hatchery:integration202411", + "metadata": "quay.io/cdis/metadata-service:integration202411", + "dashboard": "quay.io/cdis/gen3-statics:integration202411" }, "arborist": { "deployment_version": "2" @@ -45,7 +45,7 @@ "name": "pelican-export", "container": { "name": "job-task", - "image": "quay.io/cdis/pelican:2024.10", + "image": "quay.io/cdis/pelican:integration202411", "pull_policy": "always", "env": [] }, diff --git a/jenkins-perf.planx-pla.net/manifests/hatchery/hatchery.json b/jenkins-perf.planx-pla.net/manifests/hatchery/hatchery.json index 3f607d1f7..b17933d90 100644 --- a/jenkins-perf.planx-pla.net/manifests/hatchery/hatchery.json +++ b/jenkins-perf.planx-pla.net/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "quay.io/cdis/gen3fuse-sidecar:2024.10", + "image": "quay.io/cdis/gen3fuse-sidecar:integration202411", "env": { "NAMESPACE": "jenkins-perf", "HOSTNAME": "jenkins-perf.planx-pla.net"