Skip to content

Commit 01dc19d

Browse files
committed
Merge pull request #2738 from mboersma/ci-to-https
docs(*): use https:// URL for ci.deis.io
2 parents cdef15c + b471c36 commit 01dc19d

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
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.
44

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

docs/contributing/test_plan.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Test Deliverables
133133
-----------------
134134

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

138138

139139
Remaining Test Tasks

docs/contributing/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ clients, and one contains the documentation. Components have source-code level
1616
verify the behavior of the components together as a system.
1717

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

2222

tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ for help with running these tests.
99
[![Testing Deis](https://readthedocs.org/projects/deis/badge/)](http://docs.deis.io/en/latest/contributing/testing/)
1010

1111
**NOTE**: These integration tests are targeted for use in Deis'
12-
[continuous integration system](http://ci.deis.io/). The tests currently assume
12+
[continuous integration system](https://ci.deis.io/). The tests currently assume
1313
they are targeting a freshly provisioned Deis cluster. **Don't** run the
1414
integration tests on a Deis installation with existing users; the tests will
1515
fail and could overwrite data.

tests/bin/setup-node.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/bash
22
#
3-
# Preps a Ubuntu 14.04 box with requirements to run as a Jenkins node to http://ci.deis.io/
3+
# Preps a Ubuntu 14.04 box with requirements to run as a Jenkins node to https://ci.deis.io/
44
# Should be run as root.
55

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

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

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

@@ -48,6 +48,6 @@ chown -R jenkins:jenkins /home/jenkins/bin
4848
# now the jenkins user has to export some envvars to start as a node
4949
echo "Remaining setup:"
5050
echo " 1. Log in as the jenkins user (sudo -i -u jenkins)"
51-
echo " 2. Visit the nodes admin interface at http://ci.deis.io/ to find the command line for this node"
51+
echo " 2. Visit the nodes admin interface at https://ci.deis.io/ to find the command line for this node"
5252
echo " 3. Export the NODE_NAME and NODE_SECRET environment variables defined there to your shell"
5353
echo " 4. Run bin/start-node.sh to connect to Jenkins and start handling jobs"

tests/bin/start-node.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
#
3-
# Connects this machine as a Jenkins node to http://ci.deis.io/
3+
# Connects this machine as a Jenkins node to https://ci.deis.io/
44
# Set NODE_NAME and NODE_SECRET to the values provided by Jenkins in the "Manage Nodes"
55
# administrative interface.
66

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

0 commit comments

Comments
 (0)