mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-27 05:50:32 +01:00
TEST
This commit is contained in:
parent
c59e7dfdee
commit
24ce5491e9
6 changed files with 19 additions and 26 deletions
|
|
@ -7,36 +7,36 @@
|
|||
# #
|
||||
# Regenerate with:
|
||||
# TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\)$/\1/p' ./.gitlab-ci/ci.template)"
|
||||
# pip3 install "git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$TEMPLATE_SHA"
|
||||
# pip3 install "git+http://gitlab.freedesktop.org/thaller/ci-templates@$TEMPLATE_SHA"
|
||||
# ci-fairy generate-template
|
||||
#
|
||||
########################################
|
||||
|
||||
|
||||
# see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
.templates_sha: &template_sha 184ca628f89f3193c249b4e34e45afee2773a833
|
||||
.templates_sha: &template_sha 0c3f682516663e131843df9f7fcade654f6285bc
|
||||
|
||||
|
||||
|
||||
include:
|
||||
# Alpine container builder template
|
||||
- project: 'freedesktop/ci-templates'
|
||||
- project: 'thaller/ci-templates'
|
||||
ref: *template_sha
|
||||
file: '/templates/alpine.yml'
|
||||
# Centos container builder template
|
||||
- project: 'freedesktop/ci-templates'
|
||||
- project: 'thaller/ci-templates'
|
||||
ref: *template_sha
|
||||
file: '/templates/centos.yml'
|
||||
# Debian container builder template
|
||||
- project: 'freedesktop/ci-templates'
|
||||
- project: 'thaller/ci-templates'
|
||||
ref: *template_sha
|
||||
file: '/templates/debian.yml'
|
||||
# Fedora container builder template
|
||||
- project: 'freedesktop/ci-templates'
|
||||
- project: 'thaller/ci-templates'
|
||||
ref: *template_sha
|
||||
file: '/templates/fedora.yml'
|
||||
# Ubuntu container builder template
|
||||
- project: 'freedesktop/ci-templates'
|
||||
- project: 'thaller/ci-templates'
|
||||
ref: *template_sha
|
||||
file: '/templates/ubuntu.yml'
|
||||
|
||||
|
|
@ -57,11 +57,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-d53edbf2ebdd'
|
||||
CENTOS_TAG: 'tag-c374af7add25'
|
||||
DEBIAN_TAG: 'tag-33f59276e980'
|
||||
FEDORA_TAG: 'tag-c374af7add25'
|
||||
UBUNTU_TAG: 'tag-33f59276e980'
|
||||
ALPINE_TAG: 'tag-7e6203220b3c'
|
||||
CENTOS_TAG: 'tag-1b7c359a7801'
|
||||
DEBIAN_TAG: 'tag-84a0afd00643'
|
||||
FEDORA_TAG: 'tag-1b7c359a7801'
|
||||
UBUNTU_TAG: 'tag-84a0afd00643'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/pipelines
|
|||
|
||||
This directory contains a template for generating [.gitlab-ci.yml](../.gitlab-ci.yml).
|
||||
|
||||
It uses [ci-templates](https://gitlab.freedesktop.org/freedesktop/ci-templates/) project.
|
||||
It uses [ci-templates](https://gitlab.freedesktop.org/thaller/ci-templates/) project.
|
||||
|
||||
To get the right version of ci-templates, see the "Regenerate with" comment in
|
||||
[.gitlab-ci.yml](../.gitlab-ci.yml). It shows how to install ci-fairy via
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
# #
|
||||
# Regenerate with:
|
||||
# TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\)$/\1/p' ./.gitlab-ci/ci.template)"
|
||||
# pip3 install "git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$TEMPLATE_SHA"
|
||||
# pip3 install "git+http://gitlab.freedesktop.org/thaller/ci-templates@$TEMPLATE_SHA"
|
||||
# ci-fairy generate-template
|
||||
#
|
||||
########################################
|
||||
|
||||
|
||||
# see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
.templates_sha: &template_sha 184ca628f89f3193c249b4e34e45afee2773a833
|
||||
.templates_sha: &template_sha 0c3f682516663e131843df9f7fcade654f6285bc
|
||||
|
||||
{# Group distros by their common (name,) tuples.#}
|
||||
{% set distro_groups = [] %}
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
include:
|
||||
{% for distro_group in distro_groups|sort(attribute='name') %}
|
||||
# {{ distro_group.name.capitalize() }} container builder template
|
||||
- project: 'freedesktop/ci-templates'
|
||||
- project: 'thaller/ci-templates'
|
||||
ref: *template_sha
|
||||
file: '/templates/{{distro_group.name}}.yml'
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# ci-fairy generate-template
|
||||
#
|
||||
# The ci-fairy tool is part of
|
||||
# https://gitlab.freedesktop.org/freedesktop/ci-templates
|
||||
# https://gitlab.freedesktop.org/thaller/ci-templates
|
||||
#
|
||||
|
||||
# Some distros are fairly similar, and we reuse similar scripts.
|
||||
|
|
|
|||
|
|
@ -4,14 +4,7 @@ set -ex
|
|||
|
||||
grep -q '^VERSION=.\(9 (stretch)\|18.04.[0-9]\+ LTS\)' /etc/os-release && IS_DEBIAN_9=1 || IS_DEBIAN_9=0
|
||||
|
||||
if [ $IS_DEBIAN_9 = 1 ]; then
|
||||
cat > /etc/apt/sources.list <<EOF
|
||||
deb http://archive.debian.org/debian/ stretch main non-free contrib
|
||||
deb-src http://archive.debian.org/debian/ stretch main non-free contrib
|
||||
deb http://archive.debian.org/debian-security/ stretch/updates main non-free contrib
|
||||
deb-src http://archive.debian.org/debian-security/ stretch/updates main non-free contrib
|
||||
EOF
|
||||
fi
|
||||
grep ^ /etc/apt/sources.list
|
||||
|
||||
if [ $IS_DEBIAN_9 = 1 ]; then
|
||||
# pam is hosted on this release to the point chfn doesn't work.
|
||||
|
|
|
|||
|
|
@ -76,5 +76,5 @@ if [ $IS_FEDORA = 1 ]; then
|
|||
TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\)$/\1/p' ./.gitlab-ci/ci.template)"
|
||||
test -n "$TEMPLATE_SHA"
|
||||
dnf install -y python3-pip
|
||||
pip3 install "git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$TEMPLATE_SHA"
|
||||
pip3 install "git+http://gitlab.freedesktop.org/thaller/ci-templates@$TEMPLATE_SHA"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue