Skip to content

Commit 0643cd8

Browse files
phrdinaphrdina
committed
ci: refresh with latest 'lcitool manifest'
* Fedora and OpenSUSE updated to the latest versions Signed-off-by: Pavel Hrdina <[email protected]>
1 parent ded4bc8 commit 0643cd8

10 files changed

+48
-28
lines changed

‎ci/buildenv/fedora-39.sh ‎ci/buildenv/fedora-41.sh

File renamed without changes.

‎ci/buildenv/opensuse-leap-15.sh

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
function install_buildenv() {
88
zypper update -y
9+
zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo
910
zypper install -y \
1011
ca-certificates \
1112
ccache \

‎ci/containers/fedora-39.Dockerfile ‎ci/containers/fedora-41.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# https://gitlab.com/libvirt/libvirt-ci
66

7-
FROM registry.fedoraproject.org/fedora:39
7+
FROM registry.fedoraproject.org/fedora:41
88

99
RUN dnf install -y nosync && \
1010
printf '#!/bin/sh\n\

‎ci/containers/opensuse-leap-15.Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
#
55
# https://gitlab.com/libvirt/libvirt-ci
66

7-
FROM registry.opensuse.org/opensuse/leap:15.5
7+
FROM registry.opensuse.org/opensuse/leap:15.6
88

99
RUN zypper update -y && \
10+
zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo && \
1011
zypper install -y \
1112
ca-certificates \
1213
ccache \

‎ci/gitlab.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111
# - RUN_PIPELINE - force creation of a CI pipeline when
1212
# pushing to a branch in a forked repository. Official
1313
# CI pipelines are triggered when merge requests are
14-
# created/updated. Setting this variable to a non-empty
15-
# value allows CI testing prior to opening a merge request.
14+
# created/updated. Setting this variable allows CI
15+
# testing prior to opening a merge request. A value
16+
# of "0" will create the pipeline but leave all jobs
17+
# to be manually started, while "1" will immediately
18+
# run all default jobs.
1619
#
1720
# - RUN_PIPELINE_UPSTREAM_ENV - same semantics as RUN_PIPELINE,
1821
# but uses the CI environment (containers) from the upstream project
@@ -38,18 +41,21 @@
3841
#
3942
# Aliases can be set for common usage
4043
#
41-
# $ git config --local alias.push-ci "push -o ci.variable=RUN_PIPELINE=1"
44+
# $ git config --local alias.push-ci "push -o ci.variable=RUN_PIPELINE=0"
45+
# $ git config --local alias.push-ci-now "push -o ci.variable=RUN_PIPELINE=1"
4246
#
4347
# Allowing the less verbose invocation
4448
#
45-
# $ git push-ci
49+
# $ git push-ci (create pipeline but don't start jobs)
50+
# $ git push-ci-now (create pipeline and start default jobs)
4651
#
4752
# Pipeline variables can also be set in the repository
4853
# pipeline config globally, or set against scheduled pipelines
4954

5055

5156
variables:
5257
RUN_UPSTREAM_NAMESPACE: libvirt
58+
CONTAINER_UPSTREAM_NAMESPACE: libvirt
5359
FF_SCRIPT_SECTIONS: 1
5460

5561

‎ci/gitlab/build-templates.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
fi
3636
- cat /packages.txt
3737
variables:
38-
IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt-dbus/ci-$NAME:latest
38+
IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt-dbus/ci-$NAME:latest
3939
rules:
4040
### PUSH events
4141

@@ -47,19 +47,27 @@
4747
when: on_success
4848

4949
# forks: pushes to a branch when a pipeline run in upstream env is explicitly requested
50-
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL'
50+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
5151
when: manual
5252
allow_failure: true
53-
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV'
53+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL'
54+
when: manual
55+
allow_failure: true
56+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
5457
when: on_success
5558

5659
# forks: pushes to branches with pipeline requested
57-
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL'
60+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"'
61+
when: manual
62+
allow_failure: true
63+
variables:
64+
IMAGE: $TARGET_BASE_IMAGE
65+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL'
5866
when: manual
5967
allow_failure: true
6068
variables:
6169
IMAGE: $TARGET_BASE_IMAGE
62-
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
70+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"'
6371
when: on_success
6472
variables:
6573
IMAGE: $TARGET_BASE_IMAGE

‎ci/gitlab/builds.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,26 @@ x86_64-debian-sid:
6262
TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
6363

6464

65-
x86_64-fedora-39:
65+
x86_64-fedora-40:
6666
extends: .native_build_job
6767
needs:
68-
- job: x86_64-fedora-39-container
68+
- job: x86_64-fedora-40-container
6969
optional: true
7070
allow_failure: false
7171
variables:
72-
NAME: fedora-39
73-
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39
72+
NAME: fedora-40
73+
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
7474

7575

76-
x86_64-fedora-40:
76+
x86_64-fedora-41:
7777
extends: .native_build_job
7878
needs:
79-
- job: x86_64-fedora-40-container
79+
- job: x86_64-fedora-41-container
8080
optional: true
8181
allow_failure: false
8282
variables:
83-
NAME: fedora-40
84-
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
83+
NAME: fedora-41
84+
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41
8585

8686

8787
x86_64-fedora-rawhide:
@@ -104,7 +104,7 @@ x86_64-opensuse-leap-15:
104104
variables:
105105
NAME: opensuse-leap-15
106106
RPM: skip
107-
TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.5
107+
TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.6
108108

109109

110110
x86_64-opensuse-tumbleweed:

‎ci/gitlab/containers.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ x86_64-debian-sid-container:
4242
NAME: debian-sid
4343

4444

45-
x86_64-fedora-39-container:
45+
x86_64-fedora-40-container:
4646
extends: .container_job
4747
allow_failure: false
4848
variables:
49-
NAME: fedora-39
49+
NAME: fedora-40
5050

5151

52-
x86_64-fedora-40-container:
52+
x86_64-fedora-41-container:
5353
extends: .container_job
5454
allow_failure: false
5555
variables:
56-
NAME: fedora-40
56+
NAME: fedora-41
5757

5858

5959
x86_64-fedora-rawhide-container:

‎ci/gitlab/sanity-checks.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ check-dco:
1818
when: on_success
1919

2020
# forks: pushes to branches with pipeline requested (including upstream env pipelines)
21-
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE'
21+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE == "0"'
22+
when: manual
23+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE == "1"'
2224
when: on_success
23-
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV'
25+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
26+
when: manual
27+
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
2428
when: on_success
2529

2630
# upstream+forks: that's all folks

‎ci/manifest.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ targets:
2828

2929
debian-sid: x86_64
3030

31-
fedora-39: x86_64
32-
3331
fedora-40: x86_64
3432

33+
fedora-41: x86_64
34+
3535
fedora-rawhide: x86_64
3636

3737
opensuse-leap-15:

0 commit comments

Comments
 (0)