Skip to content

Commit

Permalink
Merge branch 'master' into tmp/508_fixes_va_qa
Browse files Browse the repository at this point in the history
  • Loading branch information
@pieterlukasse
pieterlukasse authored Jan 14, 2025
2 parents 3350c13 + 5f2466d commit 3532669
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 54 deletions.
28 changes: 14 additions & 14 deletions jenkins-perf.planx-pla.net/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "quay.io/cdis/arborist:integration202501",
"arborist": "quay.io/cdis/arborist:2025.01",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1",
"fence": "quay.io/cdis/fence:integration202501",
"fence": "quay.io/cdis/fence:2025.01",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"indexd": "quay.io/cdis/indexd:integration202501",
"peregrine": "quay.io/cdis/peregrine:integration202501",
"portal": "quay.io/cdis/data-portal:integration202501",
"revproxy": "quay.io/cdis/nginx:integration202501",
"sheepdog": "quay.io/cdis/sheepdog:integration202501",
"manifestservice": "quay.io/cdis/manifestservice:integration202501",
"wts": "quay.io/cdis/workspace-token-service:integration202501",
"sower": "quay.io/cdis/sower:integration202501",
"hatchery": "quay.io/cdis/hatchery:integration202501",
"metadata": "quay.io/cdis/metadata-service:integration202501",
"dashboard": "quay.io/cdis/gen3-statics:integration202501"
"indexd": "quay.io/cdis/indexd:2025.01",
"peregrine": "quay.io/cdis/peregrine:2025.01",
"portal": "quay.io/cdis/data-portal:2025.01",
"revproxy": "quay.io/cdis/nginx:2025.01",
"sheepdog": "quay.io/cdis/sheepdog:2025.01",
"manifestservice": "quay.io/cdis/manifestservice:2025.01",
"wts": "quay.io/cdis/workspace-token-service:2025.01",
"sower": "quay.io/cdis/sower:2025.01",
"hatchery": "quay.io/cdis/hatchery:2025.01",
"metadata": "quay.io/cdis/metadata-service:2025.01",
"dashboard": "quay.io/cdis/gen3-statics:2025.01"
},
"arborist": {
"deployment_version": "2"
Expand All @@ -45,7 +45,7 @@
"name": "pelican-export",
"container": {
"name": "job-task",
"image": "quay.io/cdis/pelican:integration202501",
"image": "quay.io/cdis/pelican:2025.01",
"pull_policy": "always",
"env": []
},
Expand Down
2 changes: 1 addition & 1 deletion jenkins-perf.planx-pla.net/manifests/hatchery/hatchery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"sidecar": {
"cpu-limit": "1.0",
"memory-limit": "256Mi",
"image": "quay.io/cdis/gen3fuse-sidecar:integration202501",
"image": "quay.io/cdis/gen3fuse-sidecar:2025.01",
"env": {
"NAMESPACE": "jenkins-perf",
"HOSTNAME": "jenkins-perf.planx-pla.net"
Expand Down
26 changes: 13 additions & 13 deletions qa-brh.planx-pla.net/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
},
"versions": {
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.12",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2025.01",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.12",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.12",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2025.01",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2025.01",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.12",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.12",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.12",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.12",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.12",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2024.12",
"requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2024.12",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.12",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.12",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.12"
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2025.01",
"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",
"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:2025.01",
"requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2025.01",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2025.01",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2025.01",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2025.01"
},
"arborist": {
"deployment_version": "2"
Expand Down
2 changes: 1 addition & 1 deletion qa-brh.planx-pla.net/manifests/hatchery/hatchery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"sidecar": {
"cpu-limit": "1.0",
"memory-limit": "256Mi",
"image": "quay.io/cdis/ecs-ws-sidecar:2024.12",
"image": "quay.io/cdis/ecs-ws-sidecar:2025.01",
"env": {
"NAMESPACE": "qa-brh",
"HOSTNAME": "qa-brh.planx-pla.net"
Expand Down
46 changes: 23 additions & 23 deletions qa-dcp.planx-pla.net/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:integration202501",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2025.01",
"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:integration202501",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:integration202501",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:integration202501",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:integration202501",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:integration202501",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:integration202501",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2025.01",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2025.01",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2025.01",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2025.01",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2025.01",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:integration202501",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:integration202501",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:integration202501",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:integration202501",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:integration202501",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2025.01",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2025.01",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2025.01",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2025.01",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2025.01",
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:integration202501",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:integration202501",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:integration202501",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:integration202501"
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2025.01",
"manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2025.01",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2025.01",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2025.01"
},
"google": {
"enabled": "yes"
Expand All @@ -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:integration202501",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-manifest-ingestion:2025.01",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -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:integration202501",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/get-dbgap-metadata:2025.01",
"pull_policy": "Always",
"env": [],
"volumeMounts": [
Expand Down Expand Up @@ -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:integration202501",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2025.01",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -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:integration202501",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/download-indexd-manifest:2025.01",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -190,7 +190,7 @@
"action": "export",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:integration202501",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2025.01",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -254,7 +254,7 @@
"action": "export-files",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:integration202501",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2025.01",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -320,7 +320,7 @@
],
"ssjdispatcher": {
"job_images": {
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:integration202501"
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2025.01"
}
},
"global": {
Expand Down
2 changes: 1 addition & 1 deletion qa-dcp.planx-pla.net/manifests/hatchery/hatchery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"sidecar": {
"cpu-limit": "1.0",
"memory-limit": "256Mi",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:integration202501",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2025.01",
"env": {
"NAMESPACE": "qa-dcp",
"HOSTNAME": "qa-dcp.planx-pla.net"
Expand Down
2 changes: 1 addition & 1 deletion qa-heal.planx-pla.net/manifests/hatchery/hatchery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"cpu-limit": "1.0",
"memory-limit": "2Gi",
"name": "(Tutorials) Example Analysis Jupyter Lab Notebooks",
"image": "quay.io/cdis/heal-notebooks:combined_tutorials__2af985287624f57d2276f4e7eecb8793735b95ed",
"image": "quay.io/cdis/heal-notebooks:combined_tutorials__16ba2ea73a41797d79d1bd732d39bbf00746b031",
"env": {
"FRAME_ANCESTORS": "https://qa-heal.planx-pla.net"
},
Expand Down

0 comments on commit 3532669

Please sign in to comment.