fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-07 02:50:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab-ci: rework extends: for "check-{patch,tree}" jobs

Browse source 
The "check-{patch,tree}" jobs use the same container as the default
test on Fedora ("pages_build", which also builds our documentation).

Previously, we thus extended "t_fedora:35". But that way we also
got things that we didn't want (.nm_artifacts and .build@template).

Solve this differently, by letting the jobs directly define what they
need. It's not much more, than extending "t_fedora:35" and workaround
to drop stuff we don't want.
This commit is contained in:
Thomas Haller 2022-03-17 20:50:54 +01:00
parent 386b95430f
commit aaa755d00d
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
.gitlab-ci.yml
View file

@ -47,11 +47,11 @@ variables:
#
# This is done by running `ci-fairy generate-template` and possibly bump
# ".default_tag".
FEDORA_TAG: '2022-03-15.0-91d80571b06e'
UBUNTU_TAG: '2022-03-15.0-9ebce5ba0bf3'
DEBIAN_TAG: '2022-03-15.0-9ebce5ba0bf3'
CENTOS_TAG: '2022-03-15.0-91d80571b06e'
ALPINE_TAG: '2022-03-15.0-b47b4f8d562a'
FEDORA_TAG: '2022-03-15.0-7d8e4ce8747b'
UBUNTU_TAG: '2022-03-15.0-8f2b80c00c12'
DEBIAN_TAG: '2022-03-15.0-8f2b80c00c12'
CENTOS_TAG: '2022-03-15.0-7d8e4ce8747b'
ALPINE_TAG: '2022-03-15.0-16cd57d5fcf6'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
@ -69,12 +69,6 @@ variables:
- NetworkManager-1*.tar.xz
- NetworkManager-1*.src.rpm
.nm_artifacts_undo:
variables:
NM_BUILD_TARBALL: 0
artifacts:
paths: []
#################################################################
# #
# containers stage #
@ -934,25 +928,31 @@ t_alpine:latest:
check-patch:
extends:
- t_fedora:35
- .nm_artifacts_undo
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:35@container-prep"
stage: test
script:
- date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
after_script:
allow_failure: true
check-tree:
extends:
- t_fedora:35
- .nm_artifacts_undo
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:35@container-prep"
stage: test
script:
- date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set
- date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc
- date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n
- date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code
after_script:
pages:
stage: deploy

24
.gitlab-ci/ci.template
View file

@ -58,12 +58,6 @@ variables:
- NetworkManager-1*.tar.xz
- NetworkManager-1*.src.rpm
.nm_artifacts_undo:
variables:
NM_BUILD_TARBALL: 0
artifacts:
paths: []
#################################################################
# #
# containers stage #
@ -197,25 +191,31 @@ t_{{distro.name}}:{{version}}:
check-patch:
extends:
- t_{{pages_build.name}}:{{pages_build.version}}
- .nm_artifacts_undo
- .fdo.distribution-image@{{pages_build.name}}
variables:
FDO_DISTRIBUTION_VERSION: '{{pages_build.version}}'
FDO_DISTRIBUTION_TAG: ${{pages_build.name.upper()}}_TAG
needs:
- "{{pages_build.name}}:{{pages_build.version}}@container-prep"
stage: test
script:
- date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
after_script:
allow_failure: true
check-tree:
extends:
- t_{{pages_build.name}}:{{pages_build.version}}
- .nm_artifacts_undo
- .fdo.distribution-image@{{pages_build.name}}
variables:
FDO_DISTRIBUTION_VERSION: '{{pages_build.version}}'
FDO_DISTRIBUTION_TAG: ${{pages_build.name.upper()}}_TAG
needs:
- "{{pages_build.name}}:{{pages_build.version}}@container-prep"
stage: test
script:
- date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set
- date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc
- date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n
- date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code
after_script:
pages:
stage: deploy