Commit 7b76eae9 authored by zauberstuhl's avatar zauberstuhl

Move docker namespace to feneas organization

* always run unit tests except for tags
parent 8a9c4ded
Pipeline #863 failed with stages
in 29 minutes and 44 seconds
......@@ -15,6 +15,8 @@ stages:
- bash scripts/install.sh
script:
- bash scripts/test.sh
except:
- tags
.job_template: &no_pipeline
except:
......
......@@ -13,7 +13,7 @@ load ganggo_helper
}
@test "$btf start diaspora#1 server" {
start_app "d1" "3000" "testing_diaspora"$(latest_tag "diaspora")
start_app "d1" "3000" "diaspora"$(latest_tag "diaspora")
[ "$?" -eq 0 ]
code=$(wait_for "docker logs $(container_id "d1")" "Starting Diaspora in production")
echo "expected 0, got $code"
......
......@@ -127,6 +127,6 @@ Setup the environment by executing following command once:
Then starting can be done by executing:
# start_app <database-name> <port> "testing_<project>"$(latest_tag <project>)
# start_app <database-name> <port> "<project>"$(latest_tag <project>)
# for starting a ganggo image that could look like following:
start_app g1 9000 "testing_ganggo"$(latest_tag "ganggo")
start_app g1 9000 "ganggo"$(latest_tag "ganggo")
......@@ -16,7 +16,7 @@ load ganggo_helper
}
@test "$btf start diaspora#1 server" {
start_app "d1" "3000" "testing_diaspora"$(latest_tag "diaspora")
start_app "d1" "3000" "diaspora"$(latest_tag "diaspora")
[ "$?" -eq 0 ]
code=$(wait_for "docker logs $(container_id "d1")" "Starting Diaspora in production")
echo "expected 0, got $code"
......
# ganggo_start_server "g1" "9000"
function ganggo_start_server() {
start_app "$1" "$2" "testing_ganggo"$(latest_tag "ganggo")
start_app "$1" "$2" "ganggo"$(latest_tag "ganggo")
[ "$?" -eq 0 ]
code=$(wait_for "docker logs $(container_id "$1")" "Listening on")
echo "expected 0, got $code"
......
......@@ -3,7 +3,7 @@
load test_helper
@test "$btf start mastodon#1 server" {
start_app "m1" "3000" "testing_mastodon"$(latest_tag "mastodon")
start_app "m1" "3000" "mastodon"$(latest_tag "mastodon")
[ "$?" -eq 0 ]
code=$(wait_for_mastodon "m1")
echo "expected 0, got $code"
......@@ -11,7 +11,7 @@ load test_helper
}
@test "$btf start mastodon#2 server" {
start_app "m2" "3001" "testing_mastodon"$(latest_tag "mastodon")
start_app "m2" "3001" "mastodon"$(latest_tag "mastodon")
[ "$?" -eq 0 ]
code=$(wait_for_mastodon "m2")
echo "expected 0, got $code"
......
# socialhome_start_server "s1" "9001"
function socialhome_start_server() {
start_app "$1" "$2" "testing_socialhome"$(latest_tag "socialhome")
start_app "$1" "$2" "socialhome"$(latest_tag "socialhome")
[ "$?" -eq 0 ]
code=$(wait_for "docker logs $(container_id "$1")" "Listening on endpoint tcp")
echo "expected 0, got $code"
......
......@@ -72,7 +72,7 @@ function get() {
fetch "GET" "" "url" "$1"
}
# start_app "g1" "3000" "testing_diaspora:v1.0.1"
# start_app "g1" "3000" "diaspora:v1.0.1"
function start_app() {
params=""
if [ ! -z ${PRSHA} ]; then
......@@ -82,11 +82,11 @@ function start_app() {
params="-e PROJECT=$PROJECT -e PRSHA=$PRSHA -e PRREPO=$PRREPO"
fi
cid=$(container_id "$1")
echo "Starting docker container $cid (thefederation/$3) on port $2"
echo "Starting docker container $cid (feneas/testsuite_$3) on port $2"
docker run --name=$cid $params \
--link $(container_id "postgres"):postgreshost \
--link $(container_id "redis"):redishost \
-e DATABASE=$1 -e PORT=$2 -d thefederation/$3
-e DATABASE=$1 -e PORT=$2 -d feneas/testsuite_$3
}
# stop_app "g1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment