diff --git a/docker-compose.yml b/docker-compose.yml index e7eebe8..a00a101 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/env.local.example b/env.local.example index 743058e..baf7990 100644 --- a/env.local.example +++ b/env.local.example @@ -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`" diff --git a/jcasc_extra_example/jenkins_extra.yaml b/jcasc_extra_example/jenkins_extra.yaml index f181e1b..d284043 100644 --- a/jcasc_extra_example/jenkins_extra.yaml +++ b/jcasc_extra_example/jenkins_extra.yaml @@ -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 " # from field for mail from Jenkins