gitlab/ci_template: make sure that the fedora build job is never run on cerbero

We exclude cerbero in the .build template but that key
is getting overwritten since !126. Valgrind needs to be
fixed first in order to remove this and the previous
workarounds.
This commit is contained in:
Jordan Petridis 2019-05-24 18:32:16 +03:00
parent e6cf53329e
commit 274f183955
No known key found for this signature in database
GPG key ID: 902CC06D159744F5

View file

@ -125,6 +125,7 @@ build fedora x86_64:
except:
variables:
- $CI_PROJECT_NAME == "gst-docs"
- $CI_PROJECT_NAME == "cerbero"
build nodebug fedora x86_64:
extends: '.build'
@ -132,9 +133,6 @@ build nodebug fedora x86_64:
image: $FEDORA30_IMAGE
variables:
MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled -Dgstreamer:gst_debug=false -Domx=enabled -Dgst-omx:target=generic -Ddoc=enabled"
except:
variables:
- $CI_PROJECT_NAME == "cerbero"
.test:
stage: 'test'
@ -573,4 +571,4 @@ documentation:
- $CI_PROJECT_NAME == "gst-integration-testsuite"
- $CI_PROJECT_NAME == "gst-python"
- $CI_PROJECT_NAME == "gst-sharp"
- $CI_PROJECT_NAME == "gst-build"
- $CI_PROJECT_NAME == "gst-build"