update dockerfiles to use Fedora
ClosedPublic
Actions

Authored by garretraziel on Feb 2 2016, 10:33 AM.

Details

Reviewers

adamwill
jskladan

Commits

rOPENQAd034c235b180: update dockerfiles, use Fedora as a base

Summary

Update dockerfiles to newest openQA and base them on Fedora image.

Test Plan

Go through README and try to start openQA through Docker.

Diff Detail

Repository

rOPENQA fedora_openqa

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

garretraziel retitled this revision from to update dockerfiles to use Fedora.Feb 2 2016, 10:33 AM

garretraziel updated this object.

garretraziel edited the test plan for this revision. (Show Details)

garretraziel added reviewers: adamwill, jskladan.

Herald added a subscriber: tflink. · View Herald TranscriptFeb 2 2016, 10:33 AM

I haven't tested this, but one comment - if we're gonna use fake auth, it'd be worth stressing *really hard* not to make this remotely connectable at all, maybe bump up the strength of that warning in the docs a bit?

In D736#13978, @adamwill wrote:

I haven't tested this, but one comment - if we're gonna use fake auth, it'd be worth stressing *really hard* not to make this remotely connectable at all, maybe bump up the strength of that warning in the docs a bit?

I agree. I thought that we'll use Docker only for development anyway, so using Fake auth would be much easier.

change method when setting OpenID on Docker, warn about deployment with Docker

Or we could just make it OpenID by default, and extend the script that allows changing the OpenID provider, to also be able to change the authmethod to Fake. How about that?

Otherwise, LGTM

This revision is now accepted and ready to land.Feb 3 2016, 1:15 PM

Closed by commit rOPENQAd034c235b180: update dockerfiles, use Fedora as a base (authored by garretraziel). · Explain WhyFeb 8 2016, 10:14 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

		Path
M		README.md (2 lines)
M		docker/README.md (27 lines)
M		docker/openqa_data/Dockerfile (4 lines)
M		docker/openqa_data/data.template/conf/openqa.ini (2 lines)
M		docker/webui/Dockerfile (24 lines)
D	M	docker/webui/openqa-ssl.conf (28 lines)
M		docker/webui/openqa.conf (27 lines)
M		docker/webui/run_openqa.sh (16 lines)
M		docker/webui/scripts/set_openid (1 line)
M		docker/worker/Dockerfile (14 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1889	278ba11		Feb 2 2016, 10:33 AM	★	★
Diff 2	1892	278ba11	- change method when setting OpenID on Docker, warn about deployment with Docker	Feb 3 2016, 8:41 AM	★	★
Diff 3	1898	278ba11	Commit rOPENQAd034c235b18038fe8c5b227352dd8fdcb3a1a955	Feb 8 2016, 10:06 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
fc55285c727c	d1e89d7fbc5b	7affb21623ba	Jan Sedlák	change method when setting OpenID on Docker, warn about deployment with Docker	Feb 3 2016, 8:41 AM
7affb21623ba	ca1059280e12	278ba11112b1	Jan Sedlák	update dockerfiles to use Fedora (Show More…)	Feb 2 2016, 10:32 AM

Diff 1898

View Options

README.md

1	openQA Fedora additional tools	1	openQA Fedora additional tools
2	==============================	2	==============================
3		3
4	This repository contains additional tools for testing Fedora with	4	This repository contains additional tools for testing Fedora with
5	[openQA](http://os-autoinst.github.io/openQA/). For actual	5	[openQA](http://os-autoinst.github.io/openQA/). For actual
6	openQA tests for Fedora, see [this repository](https://bitbucket.org/rajcze/openqa_fedora).	6	openQA tests for Fedora, see [this repository](https://bitbucket.org/rajcze/openqa_fedora).
7		7
8	Installation of openQA	8	Installation of openQA
9	----------------------	9	----------------------
10	There are currently two options how to install openQA to do Fedora testing.	10	There are currently two options how to install openQA to do Fedora testing.
11		11
12	1. Use OpenSUSE instance and install openQA on top of it - see `InstallGuide.md`	12	1. Use OpenSUSE instance and install openQA on top of it - see `InstallGuide.md`
13	2. Use any Linux distribution and use Docker - see `docker/README.md`	13	2. Use any Linux distribution and use Docker - see `docker/README.md`
14		14
		15	Second option (with Docker) is purposed only for development and is not recommended for deployment.
		16
15	Installation of fedora-openqa-schedule	17	Installation of fedora-openqa-schedule
16	--------------------------------------	18	--------------------------------------
17		19
18	After openQA is installed, you will probably want to set up	20	After openQA is installed, you will probably want to set up
19	fedora-openqa-schedule, a tool for downloading ISOs, scheduling tests and	21	fedora-openqa-schedule, a tool for downloading ISOs, scheduling tests and
20	reporting results to the wiki. Otherwise you will have to find some other way	22	reporting results to the wiki. Otherwise you will have to find some other way
21	to generate test jobs. If you have deployed openQA in docker containers,	23	to generate test jobs. If you have deployed openQA in docker containers,
22	note that fedora-openqa-schedule must be installed and configured on the	24	note that fedora-openqa-schedule must be installed and configured on the
▲ Show 20 Lines • Show All 118 Lines • Show Last 20 Lines

View Options

docker/README.md

1	# Get docker images	1		# Get docker images
2		2
3	You can either build the images locally, or get our "latest stable" version from the Docker hub. We recommend using the Docker hub option.	3		You can either build the images locally, or get our "latest stable" version from the Docker hub. We recommend using the Docker hub option.
4		4
5	## Download images from the Docker hub	5		## Download images from the Docker hub
6		6
7	docker pull fedoraqa/openqa_data	7		docker pull fedoraqa/openqa_data
8	docker pull fedoraqa/openqa_webui	8		docker pull fedoraqa/openqa_webui
9	docker pull fedoraqa/openqa_worker	9		docker pull fedoraqa/openqa_worker
10		10
11	## Build images locally	11		## Build images locally
12		12
13	docker build -t fedoraqa/openqa_webui:latest ./webui	13		docker build -t fedoraqa/openqa_webui:latest ./webui
14	docker build -t fedoraqa/openqa_worker:latest ./worker	14		docker build -t fedoraqa/openqa_worker:latest ./worker
15	docker build -t fedoraqa/openqa_data:latest ./openqa_data	15		docker build -t fedoraqa/openqa_data:latest ./openqa_data
16		16
17	# Running OpenQA	17		# Running openQA
18		18
19	Our intent was to create universal `webui` and `worker` containers and move all data storage and configurations to third container,	19		Our intent was to create universal `webui` and `worker` containers and move all data storage and configurations to third container,
20	called `openqa_data`. `openqa_data` is so called [Data Volume Container](http://docs.docker.com/userguide/dockervolumes/#creating-and-mounting-a-data-volume-container)	20		called `openqa_data`. `openqa_data` is so called [Data Volume Container](http://docs.docker.com/userguide/dockervolumes/#creating-and-mounting-a-data-volume-container)
21	and is used as database, results and configuration storage. During development and in production, you could update `webui` and `worker` images	21		and is used as database, results and configuration storage. During development and in production, you could update `webui` and `worker` images
22	but as long as `openqa_data` is intact, you don't lose any data.	22		but as long as `openqa_data` is intact, you don't lose any data.
23		23
24	To make development easier and to reduce final size of `openqa_data` container, this guide describes how to override `tests` and `factory` directories	24		To make development easier and to reduce final size of `openqa_data` container, this guide describes how to override `tests` and `factory` directories
25	with directories from your host system. It's not necessary, but it's recommended and this guide is written with this setup in mind.	25		with directories from your host system. It's not necessary, but it's recommended and this guide is written with this setup in mind.
26		26
27	It's also possible to use `tests` and `factory` from within the `openqa_data` container (so you don't have any dependency on your host system) or	27		It's also possible to use `tests` and `factory` from within the `openqa_data` container (so you don't have any dependency on your host system) or
28	to ditch `openqa_data` container altogether (so you have only `webui` and `worker` containers and data is loaded and saved completely into your host	28		to ditch `openqa_data` container altogether (so you have only `webui` and `worker` containers and data is loaded and saved completely into your host
29	system). If this is what you want, refer to [Keeping all data in the Data Volume Container] and [Keeping all data on the host system] sections respectively.	29		system). If this is what you want, refer to [Keeping all data in the Data Volume Container] and [Keeping all data on the host system] sections respectively.
30		30
31	## Create directory structure	31		## Create directory structure
32		32
33	mkdir -p data/factory/{iso,hdd} data/tests	33		mkdir -p data/factory/{iso,hdd} data/tests
34		34
35	It is also necessary to either run all containers in privileged mode, or set selinux properly:	35		It is also necessary to either run all containers in privileged mode, or set selinux properly:
36		36
37	chcon -Rt svirt_sandbox_file_t data	37		chcon -Rt svirt_sandbox_file_t data
38		38
39	## Run the Data & WebUI containers	39		## Run the Data & WebUI containers
40		40
41	docker run -d -h openqa_data --name openqa_data -v `pwd`/data/factory:/data/factory -v `pwd`/data/tests:/data/tests fedoraqa/openqa_data	41		docker run -d -h openqa_data --name openqa_data -v `pwd`/data/factory:/data/factory -v `pwd`/data/tests:/data/tests fedoraqa/openqa_data
42	docker run -d -h openqa_webui --volumes-from openqa_data --name openqa_webui -p 80:80 -p 443:443 fedoraqa/openqa_webui	42		docker run -d -h openqa_webui --volumes-from openqa_data --name openqa_webui -p 80:80 fedoraqa/openqa_webui
43		43
44	You can change the `-p` parameters if you do not want the openQA instance to own ports 80 and 443, e.g. `-p 8080:80 -p 8043:443`, but this will cause problems if you wish to set up workers on other hosts (see below). You do need root privileges to bind ports 80 and 443 in this way.	44		You can change the `-p` parameters if you do not want the openQA instance to own port 80, e.g. `-p 8080:80`, but this will cause problems if you wish to set up workers on other hosts (see below). You do need root privileges to bind port 80 in this way.
45		45
46	It is now necessary to create and store the client keys for OpenQA. In the next two steps, you will set an OpenID provider (if necessary),	46		It is now necessary to create and store the client keys for openQA.
47	create the API keys in the OpenQA's web interface, and store the configuration in the Data Container.
48
49	### Change the OpenID provider
50
51	https://id.fedoraproject.org/ is set as a default OpenID provider. To change it, run:
52
53	docker exec -ti openqa_webui /scripts/set_openid
54
55	and enter the Provider's URL.
56		47
57	### Set API keys	48		### Set API keys
58		49
59	Go to https://localhost/api_keys, generate key and secret. Then run:	50		Go to https://localhost/api_keys, generate key and secret. Then run:
60		51
61	docker exec -ti openqa_webui /scripts/client-conf set -l (KEY) (SECRET)	52		docker exec -ti openqa_webui /scripts/client-conf set -l (KEY) (SECRET)
62		53
		54		### Changing the authentication method
		55
		56		Dockerized version of openQA is purposed mainly for development, so it's using only `Fake` authentication (it means that you are logged in as administrator as soon as you click on "login" button). If you want to change that to OpenID, use `set_openid` script like this:
		57
		58		docker exec -ti openqa_webui /scripts/set_openid
		59
63	## Run the Worker container	60		## Run the Worker container
64		61
65	docker run -h openqa_worker_1 --name openqa_worker_1 -d --link openqa_webui:openqa_webui --volumes-from openqa_data --privileged fedoraqa/openqa_worker	62		docker run -h openqa_worker_1 --name openqa_worker_1 -d --link openqa_webui:openqa_webui --volumes-from openqa_data --privileged fedoraqa/openqa_worker
66		63
67	Check whether the worker connected in the WebUI's administration interface.	64		Check whether the worker connected in the WebUI's administration interface.
68		65
69	To add more workers, increase number that is used in hostname and container name, so to add worker 2 use:	66		To add more workers, increase number that is used in hostname and container name, so to add worker 2 use:
70		67
Show All 20 Lines
91	And set permissions, so any user can read/write the data:	88		And set permissions, so any user can read/write the data:
92		89
93	chmod -R 777 data	90		chmod -R 777 data
94		91
95	This step is unfortunately necessary because Docker [can't mount volume with specific user ownership](https://github.com/docker/docker/issues/7198) in container, so ownership of mounted folders (uid and gid) is the same as on your host system (presumably 1000:1000 which maps into nonexistent user in all of the containers).	92		This step is unfortunately necessary because Docker [can't mount volume with specific user ownership](https://github.com/docker/docker/issues/7198) in container, so ownership of mounted folders (uid and gid) is the same as on your host system (presumably 1000:1000 which maps into nonexistent user in all of the containers).
96		93
97	If you wish to keep the tests (for example) separate from the shared directory, for any reason (we do, in our development scenario) refer to the [Developing tests with Container setup] section at the end of this document.	94		If you wish to keep the tests (for example) separate from the shared directory, for any reason (we do, in our development scenario) refer to the [Developing tests with Container setup] section at the end of this document.
98		95
99	Populate the OpenQA's database:	96		Populate the openQA's database:
100		97
101	docker exec openqa_webui /var/lib/openqa/tests/fedora/templates	98		docker exec openqa_webui /var/lib/openqa/tests/fedora/templates
102		99
103	Create all necessary disk images:	100		Create all necessary disk images:
104		101
105	clone https://bitbucket.org/rajcze/openqa_fedora_tools	102		clone https://bitbucket.org/rajcze/openqa_fedora_tools
106	dnf install libguestfs-tools libguestfs-xfs expect	103		dnf install libguestfs-tools libguestfs-xfs expect
107	cd data/factory/hdd && /PATH/TO/openqa_fedora_tools/tools/createhdds.py	104		cd data/factory/hdd && /PATH/TO/openqa_fedora_tools/tools/createhdds.py
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Line(s)		159	In the [Run the Worker container] section, run worker as:
163		160
164	docker run -h openqa_worker_1 --name openqa_worker_1 -d --link openqa_webui:openqa_webui -v `pwd`/data:/data --volumes-from openqa_webui --privileged fedoraqa/openqa_worker:4.1-3.12 1	161		docker run -h openqa_worker_1 --name openqa_worker_1 -d --link openqa_webui:openqa_webui -v `pwd`/data:/data --volumes-from openqa_webui --privileged fedoraqa/openqa_worker:4.1-3.12 1
165		162
166	Then continue with tests and ISOs downloading as before.	163		Then continue with tests and ISOs downloading as before.
167		164
168	## Developing tests with Container setup	165		## Developing tests with Container setup
169		166
170	With this setup, the needles created from the WebUI will almost certainly have different owner and group than your user account.	167		With this setup, the needles created from the WebUI will almost certainly have different owner and group than your user account.
171	As we have the tests in GIT, and still want to retain the original owner and permission, even as we update/crate needles from OpenQA.	168		As we have the tests in GIT, and still want to retain the original owner and permission, even as we update/crate needles from openQA.
172	To accomplish this, we are using BindFS. An example entry in `/etc/fstab`:	169		To accomplish this, we are using BindFS. An example entry in `/etc/fstab`:
173		170
174	bindfs#/home/jskladan/src/openQA/openqa_fedora /home/jskladan/src/openQA/openqa_fedora_tools/docker/data/tests/fedora fuse create-for-user=jskladan,create-for-group=jskladan,create-with-perms=664:a+X,perms=777 0 0	171		bindfs#/home/jskladan/src/openQA/openqa_fedora /home/jskladan/src/openQA/openqa_fedora_tools/docker/data/tests/fedora fuse create-for-user=jskladan,create-for-group=jskladan,create-with-perms=664:a+X,perms=777 0 0
175		172
176	Mounts the `openqa_fedora` directory to the `.../tests/fedora directory`. All files in the `tests/fedora` directory seem to have 777 permissions set, but new files are created (in the underlying `openqa_fedora` directory) with `jskladan:jskladan` user and group, and 664:a+X permissions.	173		Mounts the `openqa_fedora` directory to the `.../tests/fedora directory`. All files in the `tests/fedora` directory seem to have 777 permissions set, but new files are created (in the underlying `openqa_fedora` directory) with `jskladan:jskladan` user and group, and 664:a+X permissions.

View Options

docker/openqa_data/Dockerfile

1	FROM opensuse:13.2	1	FROM fedora:23
2	MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com>	2	MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com>
3		3
4	RUN zypper --non-interactive in ca-certificates-mozilla git wget	4	RUN dnf install -y git wget
5		5
6	ADD data.template /data	6	ADD data.template /data
7	RUN chmod -R 777 /data	7	RUN chmod -R 777 /data
8	VOLUME ["/data"]	8	VOLUME ["/data"]
9		9
10	CMD /bin/true	10	CMD /bin/true

View Options

docker/openqa_data/data.template/conf/openqa.ini

Show All 21 Lines
22	# hsts = 365	22	# hsts = 365
23		23
24	#[scm git]	24	#[scm git]
25	#do_push = no	25	#do_push = no
26		26
27	## Authentication method to use for user management	27	## Authentication method to use for user management
28	[auth]	28	[auth]
29	# method = Fake\|OpenID\|iChain	29	# method = Fake\|OpenID\|iChain
30	method = OpenID	30	method = Fake
31		31
32	[logging]	32	[logging]
33	#if you use another file, remember the apparmor profile!	33	#if you use another file, remember the apparmor profile!
34	#file = /var/log/openqa	34	#file = /var/log/openqa
35	level = info	35	level = info
36	#sql_debug = true	36	#sql_debug = true
37		37
38	## Configuration for OpenID auth method	38	## Configuration for OpenID auth method
39	[openid]	39	[openid]
40	## base url for openid provider	40	## base url for openid provider
41	provider = https://id.fedoraproject.org/	41	provider = https://id.fedoraproject.org/
42	## enforce redirect back to https	42	## enforce redirect back to https
43	httpsonly = 0	43	httpsonly = 0

View Options

docker/webui/Dockerfile

1	FROM opensuse:13.2	1	FROM fedora:23
2	MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com>	2	MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com>
3		3
4	RUN zypper --non-interactive in ca-certificates-mozilla curl && \	4	RUN dnf install -y 'dnf-command(copr)' && \
5	zypper ar -f obs://devel:openQA:stable/openSUSE_13.2 openQA && \	5	dnf copr -y enable adamwill/openQA && \
6	zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules && \	6	dnf install -y openqa libselinux-python git json_diff libselinux-utils \
7	curl https://build.opensuse.org/source/devel:openQA/_pubkey > /tmp/openQA-pubkey && rpm --import /tmp/openQA-pubkey && \	7	libsemanage-python 'perl(Class::DBI::Pg)' 'perl(DateTime::Format::Pg)'
8	zypper --non-interactive in openQA
9		8
10	# TEMP: add create_admin script (pending upstream merge)	9	# TEMP: add create_admin script (pending upstream merge)
11	# https://github.com/os-autoinst/openQA/pull/444	10	# https://github.com/os-autoinst/openQA/pull/444
12	ADD create_admin /var/lib/openqa/script/create_admin	11	ADD create_admin /var/lib/openqa/script/create_admin
13		12
14	# setup apache	13	ADD openqa.conf /etc/httpd/conf.d/openqa.conf
15	RUN gensslcert && \
16	a2enmod headers && \
17	a2enmod proxy && \
18	a2enmod proxy_http && \
19	a2enmod proxy_wstunnel && \
20	a2enmod ssl && \
21	a2enflag SSL
22	ADD openqa-ssl.conf /etc/apache2/vhosts.d/openqa-ssl.conf
23	ADD openqa.conf /etc/apache2/vhosts.d/openqa.conf
24	ADD run_openqa.sh /root/	14	ADD run_openqa.sh /root/
25	ADD scripts /scripts	15	ADD scripts /scripts
26	RUN chmod -R 777 /scripts	16	RUN chmod -R 777 /scripts
27		17
28	# set-up shared data and configuration	18	# set-up shared data and configuration
29	RUN rm -rf /etc/openqa/openqa.ini /etc/openqa/client.conf \	19	RUN rm -rf /etc/openqa/openqa.ini /etc/openqa/client.conf \
30	/var/lib/openqa/share/factory /var/lib/openqa/share/tests \	20	/var/lib/openqa/share/factory /var/lib/openqa/share/tests \
31	/var/lib/openqa/db/db.sqlite /var/lib/openqa/testresults && \	21	/var/lib/openqa/db/db.sqlite /var/lib/openqa/testresults && \
32	chmod +x /root/run_openqa.sh && \	22	chmod +x /root/run_openqa.sh && \
33	mkdir -p /run/dbus && \	23	mkdir -p /run/dbus && \
34	ln -s /data/conf/openqa.ini /etc/openqa/openqa.ini && \	24	ln -s /data/conf/openqa.ini /etc/openqa/openqa.ini && \
35	ln -s /data/conf/client.conf /etc/openqa/client.conf && \	25	ln -s /data/conf/client.conf /etc/openqa/client.conf && \
36	ln -s /data/factory /var/lib/openqa/share/factory && \	26	ln -s /data/factory /var/lib/openqa/share/factory && \
37	ln -s /data/tests /var/lib/openqa/share/tests && \	27	ln -s /data/tests /var/lib/openqa/share/tests && \
38	ln -s /data/testresults /var/lib/openqa/testresults && \	28	ln -s /data/testresults /var/lib/openqa/testresults && \
39	ln -s /data/db/db.sqlite /var/lib/openqa/db/db.sqlite	29	ln -s /data/db/db.sqlite /var/lib/openqa/db/db.sqlite
40		30
41	EXPOSE 80 443	31	EXPOSE 80
42	CMD ["/root/run_openqa.sh"]	32	CMD ["/root/run_openqa.sh"]

View Options

docker/webui/openqa-ssl.conf

This file was deleted.

This file was completely deleted. Show File Contents

View Options

docker/webui/openqa.conf

1	# sample apache config file for the openqa vhost. At the very
2	# minimum you need to set the ServerName.
3	#
4	# If this is your first vhost you must create a default vhost, e.g.
5	# in 01-default.conf with the following content:
6	#
7	#NameVirtualHost *:80
8	#<VirtualHost *:80>
9	# ServerName www.example.com
10	# DocumentRoot "/srv/www/htdocs"
11	#</VirtualHost>
12	#
13	# Also, the following apache modules must be enabled:
14	#
15	# a2enmod headers
16	# a2enmod proxy
17	# a2enmod proxy_http
18	# a2enmod proxy_wstunnel
19
20	<VirtualHost *:80>	1	<VirtualHost *:80>
21		2	Include conf.d/openqa-common.inc
22	#ServerName your.server.name
23
24	Include /etc/apache2/vhosts.d/openqa-common.inc
25
26	</VirtualHost>	3	</VirtualHost>
27
28	# vim: syntax=apache

View Options

docker/webui/run_openqa.sh

1	#!/bin/bash	1	#!/bin/bash
2		2
3	_term() {	3	_term() {
4	kill -TERM "$child" 2>/dev/null	4	kill -TERM "$child" 2>/dev/null
5	}	5	}
6		6
7	trap _term SIGTERM	7	trap _term SIGTERM
8		8
9	# prepare environment	9	# prepare environment
10	/usr/share/openqa/script/upgradedb --user geekotest --upgrade_database	10	/usr/share/openqa/script/upgradedb --user geekotest --upgrade_database
11		11
12	# run services	12	# run services
13	dbus-daemon --system --fork --nopidfile	13	dbus-daemon --system --fork
14	start_daemon -u geekotest /usr/share/openqa/script/openqa-scheduler &	14	su -s /bin/bash -c '/usr/share/openqa/script/openqa-scheduler' geekotest &
15	start_daemon -u geekotest /usr/share/openqa/script/openqa-websockets &	15	su -s /bin/bash -c '/usr/share/openqa/script/openqa-websockets' geekotest &
16	start_daemon -u geekotest /usr/share/openqa/script/openqa gru -m production run &	16	/usr/sbin/httpd
17	rcapache2 start	17	su -s /bin/bash -c '/usr/share/openqa/script/openqa prefork -m production --proxy' geekotest &
18	start_daemon -u geekotest /usr/share/openqa/script/openqa prefork -m production --proxy &
19		18
20	child=$!	19	child=$!
21	wait "$child"	20	wait "$child"
22		21
23	rcapache2 stop	22	kill -TERM `cat /run/httpd/httpd.pid`
24	pkill dbus-daemon	23	kill -TERM `cat /run/dbus/messagebus.pid`
		24	rm -rf /run/dbus/*

View Options

docker/webui/scripts/set_openid

1	#!/bin/bash	1	#!/bin/bash
2		2
3	echo OpenID provider:	3	echo OpenID provider:
4	read OPENID	4	read OPENID
5		5
6	awk -v openid="$OPENID" '	6	awk -v openid="$OPENID" '
7	/^provider/ {$0 = "provider = " openid}	7	/^provider/ {$0 = "provider = " openid}
		8	/^method/ {$0 = "method = OpenID"}
8	{print}	9	{print}
9	' /data/conf/openqa.ini > /data/conf/openqa.ini.new	10	' /data/conf/openqa.ini > /data/conf/openqa.ini.new
10	mv /data/conf/openqa.ini.new /data/conf/openqa.ini	11	mv /data/conf/openqa.ini.new /data/conf/openqa.ini
11		12
12	echo "The file now contains:"	13	echo "The file now contains:"
13	cat /data/conf/openqa.ini	14	cat /data/conf/openqa.ini

View Options

docker/worker/Dockerfile

1	FROM opensuse:13.2	1	FROM fedora:23
2	MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com>	2	MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com>
3		3
4	RUN zypper --non-interactive in ca-certificates-mozilla curl && \	4	RUN dnf install -y 'dnf-command(copr)' dnf-plugins-core && \
5	zypper ar -f obs://devel:openQA:stable/openSUSE_13.2 openQA && \	5	dnf config-manager -y --add-repo http://www.kraxel.org/repos/firmware.repo && \
6	zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules && \	6	dnf copr -y enable adamwill/openQA && \
7	zypper ar -f obs://Virtualization/openSUSE_13.2 Virtualization && \	7	dnf install -y openqa-worker libselinux-python edk2.git-ovmf-x64
8	curl https://build.opensuse.org/source/devel:openQA/_pubkey > /tmp/pubkey && rpm --import /tmp/pubkey && \	8
9	curl https://build.opensuse.org/source/Virtualization/_pubkey > /tmp/virt_pubkey && rpm --import /tmp/virt_pubkey && \
10	zypper --non-interactive in openQA-worker qemu-kvm kmod qemu-ovmf-x86_64
11		9
12	# set-up qemu	10	# set-up qemu
13	RUN mkdir -p /root/qemu	11	RUN mkdir -p /root/qemu
14	ADD kvm-mknod.sh /root/qemu/kvm-mknod.sh	12	ADD kvm-mknod.sh /root/qemu/kvm-mknod.sh
15	RUN chmod +x /root/qemu/*.sh && /root/qemu/kvm-mknod.sh && \	13	RUN chmod +x /root/qemu/*.sh && /root/qemu/kvm-mknod.sh && \
16	# set-up shared data and configuration	14	# set-up shared data and configuration
17	rm -rf /etc/openqa/client.conf /etc/openqa/workers.ini && \	15	rm -rf /etc/openqa/client.conf /etc/openqa/workers.ini && \
18	mkdir -p /var/lib/openqa/share && \	16	mkdir -p /var/lib/openqa/share && \
19	ln -s /data/conf/client.conf /etc/openqa/client.conf && \	17	ln -s /data/conf/client.conf /etc/openqa/client.conf && \
20	ln -s /data/conf/workers.ini /etc/openqa/workers.ini && \	18	ln -s /data/conf/workers.ini /etc/openqa/workers.ini && \
21	ln -s /data/factory /var/lib/openqa/share/factory && \	19	ln -s /data/factory /var/lib/openqa/share/factory && \
22	ln -s /data/tests /var/lib/openqa/share/tests	20	ln -s /data/tests /var/lib/openqa/share/tests
23		21
24	ENTRYPOINT ["/usr/share/openqa/script/worker", "--verbose", "--instance"]	22	ENTRYPOINT ["/usr/share/openqa/script/worker", "--verbose", "--instance"]
25	CMD ["1"]	23	CMD ["1"]

update dockerfiles to use FedoraClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 1898

README.md

docker/README.md

docker/openqa_data/Dockerfile

docker/openqa_data/data.template/conf/openqa.ini

docker/webui/Dockerfile

docker/webui/openqa-ssl.conf

docker/webui/openqa.conf

docker/webui/run_openqa.sh

docker/webui/scripts/set_openid

docker/worker/Dockerfile

update dockerfiles to use Fedora
ClosedPublic
Actions