Skip to content

Commit ef35dd1

Browse files
committed
Merge branch 'feature/install-datetimetz' of https://github.com/ppodgorsek/docker-robot-framework.git into feature/install-datetimetz
2 parents 1b1e555 + 97821f1 commit ef35dd1

File tree

3 files changed

+75
-40
lines changed

3 files changed

+75
-40
lines changed

.github/workflows/docker-build.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Docker
2+
3+
on:
4+
push:
5+
# Publish `master` as Docker `latest` image.
6+
branches:
7+
- master
8+
9+
# Publish `v1.2.3` tags as releases.
10+
tags:
11+
- '*'
12+
13+
# Run tests for any PRs.
14+
pull_request:
15+
16+
env:
17+
# The image name
18+
IMAGE_NAME: docker-robot-framework:ci
19+
20+
jobs:
21+
# Run tests.
22+
# See also https://docs.docker.com/docker-hub/builds/automated-testing/
23+
build:
24+
runs-on: ubuntu-latest
25+
# run all our tests on each browser
26+
strategy:
27+
matrix:
28+
include:
29+
- browser: "chrome"
30+
- browser: "firefox"
31+
env:
32+
BROWSER: ${{ matrix.browser }}
33+
steps:
34+
- name: Checkout
35+
uses: actions/checkout@v2
36+
- name: Build image
37+
run:
38+
docker build . --tag $IMAGE_NAME --file Dockerfile
39+
- name: Basic Test
40+
run:
41+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER $IMAGE_NAME
42+
- name: Colour Depth 16 Test
43+
run:
44+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e SCREEN_COLOUR_DEPTH=16 $IMAGE_NAME
45+
- name: Screen Width 800x600 Test
46+
run:
47+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e SCREEN_WIDTH=800 -e SCREEN_HEIGHT=600 $IMAGE_NAME
48+
- name: Screen Width 1024x768 Test
49+
run:
50+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e SCREEN_WIDTH=1024 -e SCREEN_HEIGHT=768 $IMAGE_NAME
51+
- name: Screen Width 1280x1024 Test
52+
run:
53+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e SCREEN_WIDTH=1280 -e SCREEN_HEIGHT=1024 $IMAGE_NAME
54+
- name: Screen Width 2560x1440 Test
55+
run:
56+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e SCREEN_WIDTH=2560 -e SCREEN_HEIGHT=1440 $IMAGE_NAME
57+
- name: Screen Width 3840x2160 Test
58+
run:
59+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e SCREEN_WIDTH=3840 -e SCREEN_HEIGHT=2160 $IMAGE_NAME
60+
- name: Debug Log Level Test
61+
run:
62+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e ROBOT_OPTIONS="--loglevel DEBUG" $IMAGE_NAME
63+
- name: Basic Multithreaded Test
64+
run:
65+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e ROBOT_THREADS=4 $IMAGE_NAME
66+
- name: Test Level Multithreaded Test
67+
run:
68+
docker run --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER -e ROBOT_THREADS=4 -e PABOT_OPTIONS="--testlevelsplit" $IMAGE_NAME
69+
- name: Custom User Test
70+
run:
71+
docker run --user=2000 --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER $IMAGE_NAME
72+
- name: Custom User and Group Test
73+
run:
74+
docker run --user=2000:2000 --shm-size=1g -v `pwd`/test:/opt/robotframework/tests:Z -e BROWSER=$BROWSER $IMAGE_NAME

.travis.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ RUN apk update \
106106
&& rm geckodriver-$GECKO_DRIVER_VERSION-linux64.tar.gz \
107107

108108
# Clean up buildtime dependencies
109-
&& apk del --no-cache --update-cache .build-deps \
109+
&& apk del --no-cache --update-cache .build-deps
110110

111111
# Create the default report and work folders with the default user to avoid runtime issues
112112
# These folders are writeable by anyone, to ensure the user can be changed on the command line.

0 commit comments

Comments
 (0)