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

Deploying GWAS to jenkins-new #2639

Merged
merged 6 commits into from
Oct 17, 2023
Merged

Deploying GWAS to jenkins-new #2639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9dfbf6f
Deploying GWAS to jenkins-new
atharvar28 Sep 29, 2023
0eeb33e
Delete jenkins-new.planx-pla.net/manifests/argo/argo.json
atharvar28 Oct 16, 2023
59d30c1
Update Jenkinsfile to run the GWASUI Tests
atharvar28 Oct 16, 2023
9472c8e
Merge branch 'master' into chore/jenkins_new_GWAS
atharvar28 Oct 16, 2023
60c9795
Merge branch 'master' into chore/jenkins_new_GWAS
atharvar28 Oct 17, 2023
56682ce
Update Jenkinsfile
atharvar28 Oct 17, 2023
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
6 changes: 3 additions & 3 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,21 +325,21 @@
"filename": "jenkins-new.planx-pla.net/manifest.json",
"hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
"is_verified": false,
"line_number": 83
"line_number": 85
},
{
"type": "Secret Keyword",
"filename": "jenkins-new.planx-pla.net/manifest.json",
"hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
"is_verified": false,
"line_number": 251
"line_number": 253
},
{
"type": "Secret Keyword",
"filename": "jenkins-new.planx-pla.net/manifest.json",
"hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
"is_verified": false,
"line_number": 257
"line_number": 259
}
],
"jenkins-niaid.planx-pla.net/manifest.json": [
Expand Down
4 changes: 3 additions & 1 deletion jenkins-new.planx-pla.net/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
"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"
"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"
},
"arborist": {
"deployment_version": "2"
Expand Down
26 changes: 25 additions & 1 deletion jenkins-new.planx-pla.net/portal/gitops.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"gaTrackingId": "UA-119127212-3",
"argoTemplate": "gwas-template",
"graphql": {
"boardCounts": [
],
Expand Down Expand Up @@ -32,6 +33,12 @@
"label": "Explore data",
"color": "#035C94"
},
{
"icon": "analysis",
"link": "/analysis",
"color": "#a2a2a2",
"name": "Apps"
},
{
"name": "Analyze Data",
"icon": "anvil-analyze",
Expand Down Expand Up @@ -79,6 +86,12 @@
"color": "#035C94",
"name": "Exploration"
},
{
"icon": "analysis",
"link": "/analysis",
"color": "#a2a2a2",
"name": "Apps"
},
{
"icon": "workspace",
"link": "/workspace",
Expand Down Expand Up @@ -107,8 +120,19 @@
"explorer": true,
"discovery": true,
"discoveryUseAggMDS": true,
"studyRegistration": true
"studyRegistration": true,
"analysis": true
},
"analysisTools": [
{
"title": "OHDSI Atlas",
"description": "Use this App for cohort creation. These will be automatically populated in the Gen3 GWAS App",
"applicationUrl": "https://atlas.qa-mickey.planx-pla.net/atlas/",
"image": "/custom/sponsors/gitops-sponsors/atlas-logo.png"
},
"GWASUIApp",
"GWASResults"
],
"discoveryConfig": {
"features": {
"advSearchFilters": {
Expand Down