Skip to content

Commit

Permalink
feat(halyard_k8s_pod): Use halyard to configure jenkins for bake and (#…
Browse files Browse the repository at this point in the history
…1532)

deploy test.
  • Loading branch information
jtk54 committed Apr 4, 2017
1 parent 36c390f commit 2bf8f8b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
8 changes: 8 additions & 0 deletions dev/hal_install_spin.docker
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ RUN apt-get install -y curl software-properties-common apt-transport-https wget
# Kubernetes config in json format so we can pass it to the
# container an an env variable.
# KUBE_CONF
#
# Name of the GCS bucket used to store Spinnaker's persistent data.
# GCS_BUCKET
#
# Parameters to configure Jenkins to talk to Spinnaker.
# JENKINS_ADDRESS
# JENKINS_USERNAME
# JENKINS_PASSWORD

WORKDIR runscript

Expand Down
11 changes: 11 additions & 0 deletions dev/hal_k8s_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@
# Kubernetes config in json format so we can pass it to the
# container an an env variable.
# KUBE_CONF
#
# Name of the GCS bucket used to store Spinnaker's persistent data.
# GCS_BUCKET
#
# Parameters to configure Jenkins to talk to Spinnaker.
# JENKINS_ADDRESS
# JENKINS_USERNAME
# JENKINS_PASSWORD

set -e
export TERMINFO=/usr/lib/terminfo
Expand Down Expand Up @@ -85,6 +93,9 @@ hal config provider google enable
hal config provider google account add my-gce-account \
--json-path /supporting_data/build.json --project $BUILD_PROJECT

hal config webhook jenkins enable
echo $JENKINS_PASSWORD | hal config webhook jenkins master add jenkins --address $JENKINS_ADDRESS --username $JENKINS_USERNAME --password

# Uses default root-folder 'spinnaker' implicitly.
hal config storage edit --account-name my-gce-account --bucket $GCS_BUCKET

Expand Down

0 comments on commit 2bf8f8b

Please sign in to comment.