Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating CI env with 2022.01 qa-niaid.planx-pla.net 1645032217 #1868

Closed
wants to merge 3 commits into from
+70 −70
Closed

Updating CI env with 2022.01 qa-niaid.planx-pla.net 1645032217 #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
684cd63
apply version 2022.01 to qa-niaid.planx-pla.net
PlanXCyborg Feb 16, 2022
52af3c6
apply version 2022.01 to qa-niaid.planx-pla.net
PlanXCyborg Feb 16, 2022
d534458
fixing the sower version
atharvar28 Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions qa-niaid.planx-pla.net/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:3.2.0",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2021.09",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.01",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's skip to 2022.02 since it's available :)

"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2022.01",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2021.09",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2021.09",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2021.09",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2021.09",
"pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2021.09",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2021.09",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2021.09",
"sower": "quay.io/cdis/sower:master",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:3.19.3",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2021.09",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.01",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.01",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.01",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.01",
"pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.01",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.01",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.01",
"sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2022.01",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.01",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2022.01",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2021.09",
"requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:1.5.0",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2021.09",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2021.09",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.01",
"requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2022.01",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.01",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.01",
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2021.09",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2021.09",
"manifestservice": "quay.io/cdis/manifestservice:master",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2021.09"
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.01",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.01",
"manifestservice": "quay.io/cdis/manifestservice:2022.01",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.01"
},
"arborist": {
"deployment_version": "2"
Expand All @@ -39,7 +39,7 @@
},
"ssjdispatcher": {
"job_images": {
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2021.09"
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2022.01"
}
},
"global": {
Expand Down Expand Up @@ -89,7 +89,7 @@
"action": "export",
"container": {
"name": "job-task",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2021.09",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pelican-export:2022.01",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -161,4 +161,4 @@
"restart_policy": "Never"
}
]
}
}
94 changes: 47 additions & 47 deletions qa-niaid.planx-pla.net/manifests/hatchery/hatchery.json
View file
Open in desktop
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:2021.09",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2022.01",
"env": {
"NAMESPACE": "qa-niaid",
"HOSTNAME": "qa-niaid.planx-pla.net"
Expand All @@ -25,51 +25,51 @@
]
},
"containers": [
{
"target-port": 8787,
"cpu-limit": "1.0",
"memory-limit": "1024Mi",
"name": "R Studio",
"image": "quay.io/cdis/rstudio:master",
"env": {
"DISABLE_AUTH": "true"
},
"args": [],
"path-rewrite": "/",
"use-tls": "false",
"ready-probe": "/",
"user-volume-location": "/home/rstudio/pd",
"fs-gid": 100
{
"target-port": 8787,
"cpu-limit": "1.0",
"memory-limit": "1024Mi",
"name": "R Studio",
"image": "quay.io/cdis/rstudio:master",
"env": {
"DISABLE_AUTH": "true"
},
{
"target-port": 8888,
"cpu-limit": "1.0",
"memory-limit": "1024Mi",
"name": "Jupyter (Python 3.9.5, R 4.1.0)",
"image": "quay.io/cdis/jupyter-6.4.0-with-base-packages:latest",
"env": {
"NAMESPACE": "qa-niaid",
"FRAME_ANCESTORS": "https://qa-niaid.planx-pla.net/"
},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''"
],
"command": [
"start-notebook.sh"
],
"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; ln -s $(pwd) /home/$IAM/pd/dockerHome; mkdir -p /home/$IAM/.jupyter/custom; echo \"define(['base/js/namespace'], function(Jupyter){Jupyter._target = '_self';})\" >/home/$IAM/.jupyter/custom/custom.js; ln -s /data /home/$IAM/pd/; true"
],
"user-uid": 1000,
"fs-gid": 100,
"user-volume-location": "/home/jovyan/pd"
}
"args": [],
"path-rewrite": "/",
"use-tls": "false",
"ready-probe": "/",
"user-volume-location": "/home/rstudio/pd",
"fs-gid": 100
},
{
"target-port": 8888,
"cpu-limit": "1.0",
"memory-limit": "1024Mi",
"name": "Jupyter (Python 3.9.5, R 4.1.0)",
"image": "quay.io/cdis/jupyter-6.4.0-with-base-packages:latest",
"env": {
"NAMESPACE": "qa-niaid",
"FRAME_ANCESTORS": "https://qa-niaid.planx-pla.net/"
},
"args": [
"--NotebookApp.base_url=/lw-workspace/proxy/",
"--NotebookApp.password=''",
"--NotebookApp.token=''"
],
"command": [
"start-notebook.sh"
],
"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; ln -s $(pwd) /home/$IAM/pd/dockerHome; mkdir -p /home/$IAM/.jupyter/custom; echo \"define(['base/js/namespace'], function(Jupyter){Jupyter._target = '_self';})\" >/home/$IAM/.jupyter/custom/custom.js; ln -s /data /home/$IAM/pd/; true"
],
"user-uid": 1000,
"fs-gid": 100,
"user-volume-location": "/home/jovyan/pd"
}
]
}
}