XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci: Docker image can be generated as part of pipeline

Browse Source 
This removes the dependency on an externally generated docker image, and
should make it easier to update the docker image or make other changes
related to it.

This is based on Debian testing, because I'm most familiar with Debian.
But it should be easy to base it on another distro.

v2:
* Use kaniko instead of docker-in-docker for image generation, so it can
  also work in unprivileged runners.
* Drop piglit.conf & tetexec.cfg overrides, just make sure the files in
  the image work.
This commit is contained in:
Michel Dänzer
2018-12-14 11:04:24 +01:00
committed by Michel Dänzer
parent ed44f9cd6a
commit f56d8e2282
4 changed files with 89 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/scripts/xinit-piglit-session.sh
View File

@@ -24,15 +24,6 @@ fi
cd $PIGLIT_DIR
# Write the piglit.conf we'll use for our testing. Don't use the
# default piglit.conf name because that may overwrite a local
# piglit.conf.
PIGLITCONF=piglit-xserver-test.conf
cat <<EOF > $PIGLITCONF
[xts]
path=$XTEST_DIR
EOF
# Skip some tests that are failing at the time of importing the script.
# "REPORT: min_bounds, rbearing was 0, expecting 2"
PIGLIT_ARGS="$PIGLIT_ARGS -x xlistfontswithinfo@3"
@@ -41,4 +32,4 @@ PIGLIT_ARGS="$PIGLIT_ARGS -x xloadqueryfont@1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont@1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont@2"
exec ./piglit-run.py xts-render -f $PIGLITCONF $PIGLIT_ARGS $PIGLIT_RESULTS_DIR
exec ./piglit-run.py xts-render $PIGLIT_ARGS $PIGLIT_RESULTS_DIR