-
Notifications
You must be signed in to change notification settings - Fork 18.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1333 from dotcloud/1331-testing-registry
testing, issue #1331: Add registry functional test to docker-ci
- Loading branch information
Showing
7 changed files
with
59 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# Credentials for tests. Buildbot source this file on tests | ||
# when needed. | ||
|
||
# Docker registry credentials. Format: 'username:password' | ||
export DOCKER_CREDS='' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,4 @@ buildbot==0.8.7p1 | |
buildbot_slave==0.8.7p1 | ||
nose==1.2.1 | ||
requests==1.1.0 | ||
flask==0.10.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#!/bin/bash | ||
|
||
# Setup of test credentials. Called by Vagrantfile | ||
export PATH="/bin:sbin:/usr/bin:/usr/sbin:/usr/local/bin" | ||
|
||
USER=$1 | ||
REGISTRY_USER=$2 | ||
REGISTRY_PWD=$3 | ||
|
||
BUILDBOT_PATH="/data/buildbot" | ||
DOCKER_PATH="/data/docker" | ||
|
||
function run { su $USER -c "$1"; } | ||
|
||
run "cp $DOCKER_PATH/testing/buildbot/credentials.cfg $BUILDBOT_PATH/master" | ||
cd $BUILDBOT_PATH/master | ||
run "sed -i -E 's#(export DOCKER_CREDS=).+#\1\"$REGISTRY_USER:$REGISTRY_PWD\"#' credentials.cfg" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
#!/bin/sh | ||
|
||
# Cleanup | ||
rm -rf docker-registry | ||
|
||
# Get latest docker registry | ||
git clone https://github.com/dotcloud/docker-registry.git | ||
|
||
# Configure and run registry tests | ||
cd docker-registry; cp config_sample.yml config.yml | ||
cd test; python -m unittest workflow |