Skip to content

Commit

Permalink
docs(*): use https:// URL for ci.deis.io
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Dec 15, 2014
1 parent cdef15c commit b471c36
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy and manage applications on your own servers. Deis builds upon [Docker](http://docker.io/) and [CoreOS](http://coreos.com) to provide a lightweight PaaS with a [Heroku-inspired](http://heroku.com) workflow.

[![Build Status](http://ci.deis.io/buildStatus/icon?job=test-master)](http://ci.deis.io/job/test-master/)
[![Build Status](https://ci.deis.io/buildStatus/icon?job=test-acceptance)](https://ci.deis.io/job/test-acceptance/)
[![Current Release](http://img.shields.io/badge/release-v1.1.0-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.1.0)
[![Latest Docs](http://img.shields.io/badge/docs-latest-fc1e5e.svg)](http://docs.deis.io/en/latest/)

Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/test_plan.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Test Deliverables
-----------------

- Detailed testing logs as generated by CI jobs.
See http://ci.deis.io/job/test-master/85/console for an example.
See https://ci.deis.io/job/test-master/85/console for an example.


Remaining Test Tasks
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ clients, and one contains the documentation. Components have source-code level
verify the behavior of the components together as a system.

GitHub pull requests for Deis are tested automatically by a Jenkins
`continuous integration`_ (CI) system at http://ci.deis.io. Contributors should
`continuous integration`_ (CI) system at https://ci.deis.io. Contributors should
run the same tests locally before proposing any changes to the Deis codebase.


Expand Down
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ for help with running these tests.
[![Testing Deis](https://readthedocs.org/projects/deis/badge/)](http://docs.deis.io/en/latest/contributing/testing/)

**NOTE**: These integration tests are targeted for use in Deis'
[continuous integration system](http://ci.deis.io/). The tests currently assume
[continuous integration system](https://ci.deis.io/). The tests currently assume
they are targeting a freshly provisioned Deis cluster. **Don't** run the
integration tests on a Deis installation with existing users; the tests will
fail and could overwrite data.
10 changes: 5 additions & 5 deletions tests/bin/setup-node.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash
#
# Preps a Ubuntu 14.04 box with requirements to run as a Jenkins node to http://ci.deis.io/
# Preps a Ubuntu 14.04 box with requirements to run as a Jenkins node to https://ci.deis.io/
# Should be run as root.

# install docker 1.3.0
# install docker 1.3.3
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
sh -c "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
apt-get update && apt-get install -yq lxc-docker-1.3.0
apt-get update && apt-get install -yq lxc-docker-1.3.3

# install java
apt-get install -yq openjdk-7-jre-headless
Expand All @@ -23,7 +23,7 @@ wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.5_x86_64.deb
dpkg -i vagrant_1.6.5_x86_64.deb && rm vagrant_1.6.5_x86_64.deb

# install go
wget -qO- https://storage.googleapis.com/golang/go1.3.1.linux-amd64.tar.gz | tar -C /usr/local -xz
wget -qO- https://storage.googleapis.com/golang/go1.3.3.linux-amd64.tar.gz | tar -C /usr/local -xz
echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile
echo "You must reboot for the global $PATH changes to take effect."

Expand All @@ -48,6 +48,6 @@ chown -R jenkins:jenkins /home/jenkins/bin
# now the jenkins user has to export some envvars to start as a node
echo "Remaining setup:"
echo " 1. Log in as the jenkins user (sudo -i -u jenkins)"
echo " 2. Visit the nodes admin interface at http://ci.deis.io/ to find the command line for this node"
echo " 2. Visit the nodes admin interface at https://ci.deis.io/ to find the command line for this node"
echo " 3. Export the NODE_NAME and NODE_SECRET environment variables defined there to your shell"
echo " 4. Run bin/start-node.sh to connect to Jenkins and start handling jobs"
6 changes: 3 additions & 3 deletions tests/bin/start-node.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
#
# Connects this machine as a Jenkins node to http://ci.deis.io/
# Connects this machine as a Jenkins node to https://ci.deis.io/
# Set NODE_NAME and NODE_SECRET to the values provided by Jenkins in the "Manage Nodes"
# administrative interface.

wget -N http://ci.deis.io/jnlpJars/slave.jar
java -jar slave.jar -jnlpUrl http://ci.deis.io/computer/${NODE_NAME?}/slave-agent.jnlp -secret ${NODE_SECRET?} &
wget -N https://ci.deis.io/jnlpJars/slave.jar
java -jar slave.jar -jnlpUrl https://ci.deis.io/computer/${NODE_NAME?}/slave-agent.jnlp -secret ${NODE_SECRET?} &

0 comments on commit b471c36

Please sign in to comment.