Skip to content

Commit

Permalink
Merge branch 'master' into chore/apply_202408_to_qa-jcoin_planx-pla_n…
Browse files Browse the repository at this point in the history
…et_1723827323
  • Loading branch information
beamcb authored Aug 27, 2024
2 parents cc927fd + a48700b commit 1408b5c
Show file tree
Hide file tree
Showing 40 changed files with 149 additions and 195 deletions.
62 changes: 31 additions & 31 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,21 @@
"filename": "jenkins-blood.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 75
"line_number": 73
},
{
"type": "Secret Keyword",
"filename": "jenkins-blood.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 243
"line_number": 241
},
{
"type": "Secret Keyword",
"filename": "jenkins-blood.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 249
"line_number": 247
}
],
"jenkins-brain.planx-pla.net/manifest.json": [
Expand All @@ -164,21 +164,21 @@
"filename": "jenkins-brain.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 89
"line_number": 87
},
{
"type": "Secret Keyword",
"filename": "jenkins-brain.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 257
"line_number": 255
},
{
"type": "Secret Keyword",
"filename": "jenkins-brain.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 263
"line_number": 261
}
],
"jenkins-dcp.planx-pla.net/manifest.json": [
Expand All @@ -187,21 +187,21 @@
"filename": "jenkins-dcp.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 85
"line_number": 83
},
{
"type": "Secret Keyword",
"filename": "jenkins-dcp.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 253
"line_number": 251
},
{
"type": "Secret Keyword",
"filename": "jenkins-dcp.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 259
"line_number": 257
}
],
"jenkins-genomel.planx-pla.net/manifest.json": [
Expand All @@ -210,21 +210,21 @@
"filename": "jenkins-genomel.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 93
"line_number": 91
},
{
"type": "Secret Keyword",
"filename": "jenkins-genomel.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 261
"line_number": 259
},
{
"type": "Secret Keyword",
"filename": "jenkins-genomel.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 267
"line_number": 265
}
],
"jenkins-new-1.planx-pla.net/manifest.json": [
Expand All @@ -233,21 +233,21 @@
"filename": "jenkins-new-1.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 85
"line_number": 83
},
{
"type": "Secret Keyword",
"filename": "jenkins-new-1.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 253
"line_number": 251
},
{
"type": "Secret Keyword",
"filename": "jenkins-new-1.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 259
"line_number": 257
}
],
"jenkins-new-2.planx-pla.net/manifest.json": [
Expand All @@ -256,21 +256,21 @@
"filename": "jenkins-new-2.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 85
"line_number": 83
},
{
"type": "Secret Keyword",
"filename": "jenkins-new-2.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 253
"line_number": 251
},
{
"type": "Secret Keyword",
"filename": "jenkins-new-2.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 259
"line_number": 257
}
],
"jenkins-new-3.planx-pla.net/manifest.json": [
Expand All @@ -279,21 +279,21 @@
"filename": "jenkins-new-3.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 85
"line_number": 83
},
{
"type": "Secret Keyword",
"filename": "jenkins-new-3.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 253
"line_number": 251
},
{
"type": "Secret Keyword",
"filename": "jenkins-new-3.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 259
"line_number": 257
}
],
"jenkins-new-4.planx-pla.net/manifest.json": [
Expand All @@ -302,21 +302,21 @@
"filename": "jenkins-new-4.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 85
"line_number": 83
},
{
"type": "Secret Keyword",
"filename": "jenkins-new-4.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 253
"line_number": 251
},
{
"type": "Secret Keyword",
"filename": "jenkins-new-4.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 259
"line_number": 257
}
],
"jenkins-new.planx-pla.net/manifest.json": [
Expand All @@ -325,21 +325,21 @@
"filename": "jenkins-new.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 85
"line_number": 83
},
{
"type": "Secret Keyword",
"filename": "jenkins-new.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 253
"line_number": 251
},
{
"type": "Secret Keyword",
"filename": "jenkins-new.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 259
"line_number": 257
}
],
"jenkins-niaid.planx-pla.net/manifest.json": [
Expand All @@ -348,21 +348,21 @@
"filename": "jenkins-niaid.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 95
"line_number": 93
},
{
"type": "Secret Keyword",
"filename": "jenkins-niaid.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 263
"line_number": 261
},
{
"type": "Secret Keyword",
"filename": "jenkins-niaid.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 269
"line_number": 267
}
],
"qa-anvil.planx-pla.net/manifest.json": [
Expand Down Expand Up @@ -7620,5 +7620,5 @@
}
]
},
"generated_at": "2024-05-15T19:32:12Z"
"generated_at": "2024-08-21T20:16:57Z"
}
7 changes: 1 addition & 6 deletions jenkins-blood.planx-pla.net/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
"dashboard": "quay.io/cdis/gen3-statics:master",
"requestor": "quay.io/cdis/requestor:master",
"cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master",
"argo-wrapper": "quay.io/cdis/argo-wrapper:master",
"cohort-middleware": "quay.io/cdis/cohort-middleware:master"
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
},
"sower": [
{
Expand Down Expand Up @@ -358,8 +356,5 @@
"guppy": {
"strategy": "auto"
}
},
"argo": {
"argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746"
}
}
4 changes: 2 additions & 2 deletions jenkins-blood.planx-pla.net/portal/gitops.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"name": "Documentation"
},
{
"link": "bpa-support@datacommons.io",
"link": "bpa-support@gen3.org",
"name": "Email Support"
}
],
Expand All @@ -166,7 +166,7 @@
"subTitle": "Explore, Analyze, and Share Data",
"text": "This website combines liquid biopsy data from academic, government, and industry partners and aims to accelerate discovery and development of therapies, diagnostic tests, and other technologies for the treatment and prevention of cancer.",
"contact": "If you have any questions about access or the registration process, please contact ",
"email": "bpa-support@datacommons.io"
"email": "bpa-support@gen3.org"
},
"certs": {
"security_quiz": {
Expand Down
5 changes: 0 additions & 5 deletions jenkins-brain.planx-pla.net/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
"versions": {
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"arborist": "quay.io/cdis/arborist:master",
"argo-wrapper": "quay.io/cdis/argo-wrapper:master",
"audit-service": "quay.io/cdis/audit-service:master",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1",
"awshelper": "quay.io/cdis/awshelper:master",
"cohort-middleware": "quay.io/cdis/cohort-middleware:master",
"fence": "quay.io/cdis/fence:master",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
"indexd": "quay.io/cdis/indexd:master",
Expand Down Expand Up @@ -355,8 +353,5 @@
"guppy": {
"strategy": "auto"
}
},
"argo": {
"argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746"
}
}
7 changes: 1 addition & 6 deletions jenkins-dcp.planx-pla.net/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
"dashboard": "quay.io/cdis/gen3-statics:master",
"requestor": "quay.io/cdis/requestor:master",
"cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master",
"argo-wrapper": "quay.io/cdis/argo-wrapper:master",
"cohort-middleware": "quay.io/cdis/cohort-middleware:master"
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
},
"arborist": {
"deployment_version": "2"
Expand Down Expand Up @@ -351,8 +349,5 @@
"guppy": {
"strategy": "auto"
}
},
"argo": {
"argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746"
}
}
7 changes: 1 addition & 6 deletions jenkins-genomel.planx-pla.net/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
"dashboard": "quay.io/cdis/gen3-statics:master",
"requestor": "quay.io/cdis/requestor:master",
"cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master",
"argo-wrapper": "quay.io/cdis/argo-wrapper:master",
"cohort-middleware": "quay.io/cdis/cohort-middleware:master"
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
},
"arborist": {
"deployment_version": "2"
Expand Down Expand Up @@ -359,8 +357,5 @@
"guppy": {
"strategy": "auto"
}
},
"argo": {
"argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746"
}
}
7 changes: 1 addition & 6 deletions jenkins-new-1.planx-pla.net/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
"dashboard": "quay.io/cdis/gen3-statics:master",
"requestor": "quay.io/cdis/requestor:master",
"cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master",
"argo-wrapper": "quay.io/cdis/argo-wrapper:master",
"cohort-middleware": "quay.io/cdis/cohort-middleware:master"
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
},
"arborist": {
"deployment_version": "2"
Expand Down Expand Up @@ -355,8 +353,5 @@
"guppy": {
"strategy": "auto"
}
},
"argo": {
"argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746"
}
}
7 changes: 1 addition & 6 deletions jenkins-new-2.planx-pla.net/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
"dashboard": "quay.io/cdis/gen3-statics:master",
"requestor": "quay.io/cdis/requestor:master",
"cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master",
"argo-wrapper": "quay.io/cdis/argo-wrapper:master",
"cohort-middleware": "quay.io/cdis/cohort-middleware:master"
"kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
},
"arborist": {
"deployment_version": "2"
Expand Down Expand Up @@ -355,8 +353,5 @@
"guppy": {
"strategy": "auto"
}
},
"argo": {
"argo_server_service_url": "http://argo-argo-workflows-server.argo.svc.cluster.local:2746"
}
}
Loading

0 comments on commit 1408b5c

Please sign in to comment.