Skip to content

Commit a6b44da

Browse files
andreafioraldiandreafioraldi
committed
Merge remote-tracking branch 'upstream/master'
2 parents e09fb7c + 9c25e1d commit a6b44da

File tree

95 files changed

+2147
-566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2147
-566
lines changed

‎.gitlab-ci.d/cirrus.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
stage: build
1515
image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
1616
needs: []
17+
timeout: 80m
1718
allow_failure: true
1819
script:
1920
- source .gitlab-ci.d/cirrus/$NAME.vars
@@ -40,6 +41,9 @@
4041
- cat .gitlab-ci.d/cirrus/$NAME.yml
4142
- cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml
4243
rules:
44+
# Allow on 'staging' branch and 'stable-X.Y-staging' branches only
45+
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH !~ /staging/'
46+
when: never
4347
- if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN"
4448

4549
x64-freebsd-12-build:

‎.gitlab-ci.d/custom-runners.yml

Lines changed: 4 additions & 235 deletions
Original file line numberDiff line numberDiff line change
@@ -13,238 +13,7 @@
1313
variables:
1414
GIT_STRATEGY: clone
1515

16-
# All ubuntu-18.04 jobs should run successfully in an environment
17-
# setup by the scripts/ci/setup/build-environment.yml task
18-
# "Install basic packages to build QEMU on Ubuntu 18.04/20.04"
19-
ubuntu-18.04-s390x-all-linux-static:
20-
needs: []
21-
stage: build
22-
tags:
23-
- ubuntu_18.04
24-
- s390x
25-
rules:
26-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
27-
- if: "$S390X_RUNNER_AVAILABLE"
28-
script:
29-
# --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763
30-
# --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages
31-
- mkdir build
32-
- cd build
33-
- ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh
34-
- make --output-sync -j`nproc`
35-
- make --output-sync -j`nproc` check V=1
36-
- make --output-sync -j`nproc` check-tcg V=1
37-
38-
ubuntu-18.04-s390x-all:
39-
needs: []
40-
stage: build
41-
tags:
42-
- ubuntu_18.04
43-
- s390x
44-
rules:
45-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
46-
- if: "$S390X_RUNNER_AVAILABLE"
47-
script:
48-
- mkdir build
49-
- cd build
50-
- ../configure --disable-libssh
51-
- make --output-sync -j`nproc`
52-
- make --output-sync -j`nproc` check V=1
53-
54-
ubuntu-18.04-s390x-alldbg:
55-
needs: []
56-
stage: build
57-
tags:
58-
- ubuntu_18.04
59-
- s390x
60-
rules:
61-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
62-
when: manual
63-
allow_failure: true
64-
- if: "$S390X_RUNNER_AVAILABLE"
65-
when: manual
66-
allow_failure: true
67-
script:
68-
- mkdir build
69-
- cd build
70-
- ../configure --enable-debug --disable-libssh
71-
- make clean
72-
- make --output-sync -j`nproc`
73-
- make --output-sync -j`nproc` check V=1
74-
75-
ubuntu-18.04-s390x-clang:
76-
needs: []
77-
stage: build
78-
tags:
79-
- ubuntu_18.04
80-
- s390x
81-
rules:
82-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
83-
when: manual
84-
allow_failure: true
85-
- if: "$S390X_RUNNER_AVAILABLE"
86-
when: manual
87-
allow_failure: true
88-
script:
89-
- mkdir build
90-
- cd build
91-
- ../configure --disable-libssh --cc=clang --cxx=clang++ --enable-sanitizers
92-
- make --output-sync -j`nproc`
93-
- make --output-sync -j`nproc` check V=1
94-
95-
ubuntu-18.04-s390x-tci:
96-
needs: []
97-
stage: build
98-
tags:
99-
- ubuntu_18.04
100-
- s390x
101-
rules:
102-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
103-
when: manual
104-
allow_failure: true
105-
- if: "$S390X_RUNNER_AVAILABLE"
106-
when: manual
107-
allow_failure: true
108-
script:
109-
- mkdir build
110-
- cd build
111-
- ../configure --disable-libssh --enable-tcg-interpreter
112-
- make --output-sync -j`nproc`
113-
114-
ubuntu-18.04-s390x-notcg:
115-
needs: []
116-
stage: build
117-
tags:
118-
- ubuntu_18.04
119-
- s390x
120-
rules:
121-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
122-
when: manual
123-
allow_failure: true
124-
- if: "$S390X_RUNNER_AVAILABLE"
125-
when: manual
126-
allow_failure: true
127-
script:
128-
- mkdir build
129-
- cd build
130-
- ../configure --disable-libssh --disable-tcg
131-
- make --output-sync -j`nproc`
132-
- make --output-sync -j`nproc` check V=1
133-
134-
# All ubuntu-20.04 jobs should run successfully in an environment
135-
# setup by the scripts/ci/setup/qemu/build-environment.yml task
136-
# "Install basic packages to build QEMU on Ubuntu 18.04/20.04"
137-
ubuntu-20.04-aarch64-all-linux-static:
138-
needs: []
139-
stage: build
140-
tags:
141-
- ubuntu_20.04
142-
- aarch64
143-
rules:
144-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
145-
- if: "$AARCH64_RUNNER_AVAILABLE"
146-
script:
147-
# --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763
148-
# --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages
149-
- mkdir build
150-
- cd build
151-
- ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh
152-
- make --output-sync -j`nproc`
153-
- make --output-sync -j`nproc` check V=1
154-
- make --output-sync -j`nproc` check-tcg V=1
155-
156-
ubuntu-20.04-aarch64-all:
157-
needs: []
158-
stage: build
159-
tags:
160-
- ubuntu_20.04
161-
- aarch64
162-
rules:
163-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
164-
when: manual
165-
allow_failure: true
166-
- if: "$AARCH64_RUNNER_AVAILABLE"
167-
when: manual
168-
allow_failure: true
169-
script:
170-
- mkdir build
171-
- cd build
172-
- ../configure --disable-libssh
173-
- make --output-sync -j`nproc`
174-
- make --output-sync -j`nproc` check V=1
175-
176-
ubuntu-20.04-aarch64-alldbg:
177-
needs: []
178-
stage: build
179-
tags:
180-
- ubuntu_20.04
181-
- aarch64
182-
rules:
183-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
184-
- if: "$AARCH64_RUNNER_AVAILABLE"
185-
script:
186-
- mkdir build
187-
- cd build
188-
- ../configure --enable-debug --disable-libssh
189-
- make clean
190-
- make --output-sync -j`nproc`
191-
- make --output-sync -j`nproc` check V=1
192-
193-
ubuntu-20.04-aarch64-clang:
194-
needs: []
195-
stage: build
196-
tags:
197-
- ubuntu_20.04
198-
- aarch64
199-
rules:
200-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
201-
when: manual
202-
allow_failure: true
203-
- if: "$AARCH64_RUNNER_AVAILABLE"
204-
when: manual
205-
allow_failure: true
206-
script:
207-
- mkdir build
208-
- cd build
209-
- ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers
210-
- make --output-sync -j`nproc`
211-
- make --output-sync -j`nproc` check V=1
212-
213-
ubuntu-20.04-aarch64-tci:
214-
needs: []
215-
stage: build
216-
tags:
217-
- ubuntu_20.04
218-
- aarch64
219-
rules:
220-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
221-
when: manual
222-
allow_failure: true
223-
- if: "$AARCH64_RUNNER_AVAILABLE"
224-
when: manual
225-
allow_failure: true
226-
script:
227-
- mkdir build
228-
- cd build
229-
- ../configure --disable-libssh --enable-tcg-interpreter
230-
- make --output-sync -j`nproc`
231-
232-
ubuntu-20.04-aarch64-notcg:
233-
needs: []
234-
stage: build
235-
tags:
236-
- ubuntu_20.04
237-
- aarch64
238-
rules:
239-
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
240-
when: manual
241-
allow_failure: true
242-
- if: "$AARCH64_RUNNER_AVAILABLE"
243-
when: manual
244-
allow_failure: true
245-
script:
246-
- mkdir build
247-
- cd build
248-
- ../configure --disable-libssh --disable-tcg
249-
- make --output-sync -j`nproc`
250-
- make --output-sync -j`nproc` check V=1
16+
include:
17+
- local: '/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml'
18+
- local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml'
19+
- local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml'

‎.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
centos-stream-8-x86_64:
2+
allow_failure: true
3+
needs: []
4+
stage: build
5+
tags:
6+
- centos_stream_8
7+
- x86_64
8+
rules:
9+
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
10+
- if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE"
11+
artifacts:
12+
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
13+
when: on_failure
14+
expire_in: 7 days
15+
paths:
16+
- build/tests/results/latest/results.xml
17+
- build/tests/results/latest/test-results
18+
reports:
19+
junit: build/tests/results/latest/results.xml
20+
before_script:
21+
- JOBS=$(expr $(nproc) + 1)
22+
script:
23+
- mkdir build
24+
- cd build
25+
- ../scripts/ci/org.centos/stream/8/x86_64/configure
26+
- make -j"$JOBS"
27+
- make NINJA=":" check
28+
- ../scripts/ci/org.centos/stream/8/x86_64/test-avocado

0 commit comments

Comments
 (0)