Skip to content

fix broken entry_point.sh. couldnt override env variables. this also … #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

fix broken entry_point.sh. couldnt override env variables. this also … #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f68480
fix broken entry_point.sh. couldnt override env variables. this also …
ddavison Sep 26, 2016
78fd4bb
no-op, just seeing if this will correct circlci build
ddavison Sep 28, 2016
d0c4fd8
removing superfluous docker-compose from hub
ddavison Sep 28, 2016
66b12b6
attempt 1 at fixing circle ci
ddavison Sep 28, 2016
e9a6600
on repeat, use updated selenium test container image
ddavison Sep 28, 2016
85189da
see what images are current. (i have a feeling it is not building cor…
ddavison Sep 28, 2016
d23ad01
try building from circle.yml instead of test.sh
ddavison Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Hub/entry_point.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
ROOT=/opt/selenium
CONF=$ROOT/config.json

$ROOT/generate_config > $CONF

echo "starting selenium hub with configuration:"
cat $CONF

Expand Down
1 change: 1 addition & 0 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- git clone https://github.com/sstephenson/bats.git && cd bats && sudo ./install.sh /usr/local
- docker info
- make build
- docker build -t test:local ./Test

test:
override:
Expand Down
2 changes: 1 addition & 1 deletion test-repeat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ COUNTER=0
while [ $COUNTER -lt 50 ]; do
echo The counter is $COUNTER
let COUNTER=COUNTER+1
docker run --rm -it --link $1:hub selenium/test:local node smoke-chrome.js
docker run --rm -it --link $1:hub test:local node smoke-chrome.js
done
7 changes: 4 additions & 3 deletions test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ else
echo 'Skipping shell functions test on Mac OS X.'
fi

echo Building test container image
docker build -t selenium/test:local ./Test
#echo Building selenium test container image
#docker build -t test:local ./Test
docker images

echo 'Starting Selenium Hub Container...'
HUB=$(docker run -d selenium/hub:2.53.1)
Expand All @@ -42,7 +43,7 @@ function test_node {
BROWSER=$1
echo Running $BROWSER test...
TEST_CMD="node smoke-$BROWSER.js"
docker run -it --link $HUB_NAME:hub -e TEST_CMD="$TEST_CMD" selenium/test:local
docker run -it --link $HUB_NAME:hub -e TEST_CMD="$TEST_CMD" test:local
STATUS=$?
TEST_CONTAINER=$(docker ps -aq | head -1)

Expand Down