Skip to content

Commit

Permalink
fix(release): Temporarily cut over to 'spinnaker-team/spinnakerbuild'. (
Browse files Browse the repository at this point in the history
  • Loading branch information
jtk54 committed May 2, 2017
1 parent dcce647 commit dc6f7ac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 5 additions & 1 deletion dev/hal_k8s_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ wget https://raw.githubusercontent.com/spinnaker/halyard/master/InstallHalyard.s
sed "s/^printf/echo/" -i InstallHalyard.sh
sed "s/^start halyard/exit 0/" -i InstallHalyard.sh

sudo bash InstallHalyard.sh -y
# TODO(jacobkiefer): CHANGE THIS BACK TO DEFAULT
sudo bash InstallHalyard.sh \
--repository 'https://dl.bintray.com/spinnaker-team/spinnakerbuild' \
--spinnaker-repository 'https://dl.bintray.com/spinnaker-team/spinnakerbuild' \
-y
echo "Starting Halyard..."
sudo /opt/halyard/bin/halyard 2>&1 /var/log/spinnaker/halyard/halyard.log &
sleep 60
Expand Down
8 changes: 6 additions & 2 deletions dev/halyard_install_component.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ function contains() {
function main() {
echo "Downloading and Running Halyard Install Script..."
wget https://raw.githubusercontent.com/spinnaker/halyard/master/InstallHalyard.sh
sudo bash InstallHalyard.sh -y
# TODO(jacobkiefer): CHANGE THIS BACK TO DEFAULT.
sudo bash InstallHalyard.sh \
--repository 'https://dl.bintray.com/spinnaker-team/spinnakerbuild' \
--spinnaker-repository 'https://dl.bintray.com/spinnaker-team/spinnakerbuild' \
-y

echo "Installing $COMPONENT and optional dependencies..."
hal config version edit --version $VERSION
Expand All @@ -84,7 +88,7 @@ function main() {
local service_names
if contains $COMPONENT "${EXTERNAL_ARTIFACTS[@]}"; then
service_names=($COMPONENT)
else
else
service_names=($COMPONENT monitoring-daemon vault-client consul-client)
fi

Expand Down

0 comments on commit dc6f7ac

Please sign in to comment.