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

Jump to bottom

add HydroShare client id and token for RavenPy notebooks #15

Merged
merged 1 commit into from
Jun 1, 2023
Merged

add HydroShare client id and token for RavenPy notebooks #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ services:
- ESGF_AUTH_USERNAME=$JENKINS_ESGF_AUTH_USERNAME
- ESGF_AUTH_PASSWORD=$JENKINS_ESGF_AUTH_PASSWORD
- ESGF_AUTH_TOKEN=$JENKINS_ESGF_AUTH_TOKEN
- HYDROSHARE_AUTH_CLIENT_ID=$JENKINS_HYDROSHARE_AUTH_CLIENT_ID
- HYDROSHARE_AUTH_TOKEN=$JENKINS_HYDROSHARE_AUTH_TOKEN
- IS_PROD=$JENKINS_IS_PROD
- ENABLE_SCHEDULED_TRIGGER=$JENKINS_ENABLE_SCHEDULED_TRIGGER
- DEFAULT_PAVICS_HOST=$JENKINS_DEFAULT_PAVICS_HOST
Expand Down
2 changes: 2 additions & 0 deletions env.local.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export JENKINS_NUM_EXECUTORS_LOCAL=4
export JENKINS_ESGF_AUTH_USERNAME=https://esgf-node.llnl.gov/esgf-idp/openid/FirstLast
export JENKINS_ESGF_AUTH_PASSWORD=MY_ESGF_PASSWORD
export JENKINS_ESGF_AUTH_TOKEN=MY_ESGF_TOKEN
export JENKINS_HYDROSHARE_AUTH_CLIENT_ID=MY_HYDROSHARE_CLIENT_ID
export JENKINS_HYDROSHARE_AUTH_TOKEN=MY_HYDROSHARE_TOKEN
export SSH_PRIVATE_KEY="`cat ../my-cert/id_rsa_jenkins`"
export JENKINS_SLAVE_SSH_PUBKEY="`cat ../my-cert/id_rsa_jenkins.pub`"

Expand Down
10 changes: 10 additions & 0 deletions jcasc_extra_example/jenkins_extra.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ credentials:
id: "esgf_auth_token"
scope: GLOBAL
secret: ${ESGF_AUTH_TOKEN}
- string:
description: "HydroShare client id"
id: "hydroshare_auth_client_id"
scope: GLOBAL
secret: ${HYDROSHARE_AUTH_CLIENT_ID}
- string:
description: "HydroShare authentication token"
id: "hydroshare_auth_token"
scope: GLOBAL
secret: ${HYDROSHARE_AUTH_TOKEN}
unclassified:
location:
adminAddress: "Jenkins <noreply@ouranos.ca>" # from field for mail from Jenkins
Expand Down