1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-19 18:50:24 +03:00

34 Commits

Author SHA1 Message Date
Andrew Bartlett
9f658aa5fe .gitlab-ci: Work around new git restrictions arising from CVE-2022-24765
It was realised that git would run commands found in a git repo
(eg from configuration).

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15193

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit dd568490089ae6d5bcf03068bfc4ca6b9103badb)
2022-10-24 07:26:14 +02:00
Andreas Schneider
52ed3d07fd bootstrap: Migrate to CentOS8 Stream
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15193

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Feb  4 21:11:40 UTC 2022 on sn-devel-184

[adapted from commit 136ec5bc01e2648bae34a1158f923fbf5a86d561 in the
 hope of getting lmdb-devel to be available for the CentoS 8 image]
2022-10-24 07:26:14 +02:00
Andrew Bartlett
ae64b3bfc1 bootstrap: chown the whole cloned repo, not just the subfolders
Modern git versions have started to notice the possible security issue.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15193

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

[abartlet@samba.org adapted from commit c771d197eeebf2b01d46451cc51b698a99502935
 with new sha1sum]
2022-10-24 07:26:14 +02:00
Andreas Schneider
6881b17bf2 bootstrap: Fix CentOS8 runner
CentOS8 is EOL since December 31, 2021. The packages move to vault.centos.org.
We should migrate to CentOS8 Stream soon.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15193

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Feb  3 14:31:01 UTC 2022 on sn-devel-184

[abartlet@samba.org Adapted from commit 0c6554aa0d6812343a8155fca3d7a7993cd5c703
 by updating sha1sum]
2022-10-24 07:26:14 +02:00
Martin Schwenke
71792ae988 bootstrap: Debian 11 has liburing-dev
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14872
RN: Add Debian 11 CI bootstrap support

Signed-off-by: Martin Schwenke <martin@meltin.net>
(backported from commit d8b6fbbd78690ae19d97cd88c5769c3edd358aaa)
2021-11-10 16:21:10 +00:00
Martin Schwenke
6ea70022f2 bootstrap: Add Debian 11
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14872

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Oct 18 17:19:17 UTC 2021 on sn-devel-184

(backported from commit c901adaa0d4526deff550806e49976d686122674)
2021-11-10 16:21:10 +00:00
Andrew Bartlett
9a25efd54a gitlab-ci: Do not download artifacts of unrelated builds
This needs: is overridden in many cases, but ensures none of the other
main jobs start until this build finishes.  However this also
ensures we do not download artifacts from any build unless we
specifically depend on it, saving bandwidth

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14863

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
(cherry picked from commit ce3d33f4c141afdfa3fbe9fe26835dc32ef95fe0)
2021-10-25 12:13:16 +00:00
Andrew Bartlett
64f81e2e58 gitlab-ci: Do not retry for job_execution_timeout
If we timeout, we should just stop at 2 hours, not waste 6 hours (3 x 2 hours).

This is for when the job runs long for any reason, currently the
reasons for a timeout are not transient, we need to either change
the timeout or fix the system.  Likewise if the tests get into a loop
or deadlock we want to see that as a failure.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14863

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
(cherry picked from commit 1cdf8493b5a43a084b5004e5c2667b9dd9e31d91)
2021-10-25 12:13:16 +00:00
Andrew Bartlett
1c1c1a0499 .gitlab-ci: Avoid duplicate CI on all merge requests
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14861

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Oct 14 01:21:11 UTC 2021 on sn-devel-184

(cherry picked from commit 8ab0238abd171f9a11b013fd185605e7d1722b27)
2021-10-25 12:13:15 +00:00
Andrew Bartlett
60419689f3 .gitlab-ci.yml: Restore building most of our jobs
We are changing the primary build jobs to use "when"
not "only".  These a similar and related GitLab syntax
tools to control when jobs are run.

With 'when' now in use it must be specified on all jobs
that inherit from each other via:

.extends .shared_template

"only" can be left however for the pages and coverity as
these use:

.extends .shared_runner_build_image

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14861

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
(cherry picked from commit bcc22d00569551cfa25851c8c267ec9decc63d21)
2021-10-25 12:13:15 +00:00
Joseph Sutton
2c36f7c67e .gitlab-ci: Increase build timeout
While the build will not take > 1hr, uploading the artifacts
needed to pass the build objects to the next stage can take
some time due to the distance between the runners and the
private CI server.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14861

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Oct 13 12:00:03 UTC 2021 on sn-devel-184

(cherry picked from commit dd178d97250e041b29aad9b26d2994163bd99231)
2021-10-25 12:13:15 +00:00
Andrew Bartlett
44ad4dc8b7 .gitlab-ci.yml: Honour AUTOBUILD_SKIP_SAMBA_O3 in GitLab CI
GitLab CI resources are expensive and often rationed so
provide a way to test other things without testing an -O3
build also, as this will save 9 jobs.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14861

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 7857e1249b72be8c8841b99cb0820c9c563178f9)
2021-10-25 12:13:15 +00:00
Andrew Bartlett
8673841082 .gitlab-ci: Allow a 1 hour to build Samba
I have seen cases where the job is pushed to the private runners
(which do not have the ccache) where this takes over 45mins, and
a typical job can be 35 mins so this is too tight.

Triggering the timeout causes a rebuild from scratch, which is
done twice automatically, and is financially costly (we pay
per VM start) and a waste of CPU/energy/etc.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14844

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Oct  1 19:43:16 UTC 2021 on sn-devel-184

(cherry picked from commit 1305ec3ae64e67fa68d3251d35f8a244a4a5be56)

Autobuild-User(v4-15-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-15-test): Tue Oct  5 15:55:35 UTC 2021 on sn-devel-184
2021-10-05 15:55:35 +00:00
Andrew Bartlett
04cbe284f4 bootstrap: Update to get newer krb5 on Fedora 34
We need the update FEDORA-2021-20b495cb94 (krb5) to
get a fix for CVE-2021-37750 (explicit NULL deref on KDC)
so our CI will pass as we have a test for this.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817
(cherry picked from commit e9c8ac4adbca2f8cb45470ccb45a45039188a285)
2021-09-08 12:32:11 +00:00
Andrew Bartlett
1dd8ded8c5 gitlab-ci: Move MIT builds to current Fedora so we can test against a current MIT KDC
Fedora packages current MIT builds pretty fast so we base our
MIT KDC tests there, as this avoids backporting and tests against
the most current code.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817
(cherry picked from commit 649b0741e17909afce762a5b84c1231600eec5f0)
2021-09-08 12:32:11 +00:00
Andrew Bartlett
961bdab664 gitlab-ci/autobuild: Add new build confirming behaviour on older MIT Kerberos
Because the MIT KDC builds are moving to current MIT and out of the default autobuild
this ensures that on our default host, which is closer to what most of our
users operate, Samba still works with Kerberos.

This uses the ktest environment that does not require the KDC to exist
and instead uses a static ccache and keytab.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817
(cherry picked from commit 6145c388d201d817444322dee67ca1ec1989ecd1)
2021-09-08 12:32:11 +00:00
Andreas Schneider
a116dec4bb bootstrap: Install python3-dateutil instead of python3-iso8601 on RPM distros
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Jul 21 12:18:30 UTC 2021 on sn-devel-184

(cherry picked from commit ee9dfff617ad21d81369d7ef2ea35d7caab82fec)
2021-09-08 12:32:10 +00:00
Andreas Schneider
8586802eac bootstrap: Install krb5-workstation on Fedora based distros
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817
(cherry picked from commit e0fa3e359f16b26122d49ad79372e3923f5ded77)
2021-09-08 12:32:10 +00:00
Andreas Schneider
047cbaad5d gitlab: Use shorter names for Samba AD DC env with MIT KRB5
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14779

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Aug  3 20:35:49 UTC 2021 on sn-devel-184
(cherry picked from commit 000f389d09ec9e9906d5e2a0aa317c471c5f5b96)
2021-08-06 14:49:17 +00:00
Andreas Schneider
170d2f85a1 gitlab-ci: Install devel files for tracker-sparql (spotlight backend)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu May 20 12:01:06 UTC 2021 on sn-devel-184
2021-05-20 12:01:06 +00:00
Andreas Schneider
ac78b921da bootstrap: Add Fedora 34 CI runner
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri May  7 07:18:02 UTC 2021 on sn-devel-184
2021-05-07 07:18:01 +00:00
Andreas Schneider
7555665664 bootstrap: Remove libnsl as we dropped NIS support
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
2021-05-07 06:23:32 +00:00
Andrew Bartlett
a4cce28bfa .gitlab-ci.yml: Always build the ubuntu1804-samba-o3 with --enable-coverage
This ensures that the coverage build always works, as it can trigger different warnings.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2021-04-28 03:43:34 +00:00
Andrew Bartlett
836ad93795 .gitlab-ci.yml: Return code coverage reporting for "none" tasks
This was lost early on with 54f26cfcf2587a2b1d97f466a886fa89a116eea1
which did not take into account code coverage, which stopped running
for these tasks very early on with
71595201bea9b3fa28357065fa137806f9220f38.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2021-04-28 03:43:34 +00:00
Andrew Bartlett
b5984c3da0 .gitlab-ci.yml and autobuild: Publish the current HTML docs with the code coverage
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2021-04-28 03:43:34 +00:00
Stefan Metzmacher
d5759794d6 add .gitlab-ci-coverage.yml for a scheduled build
This will be used by the https://gitlab.com/samba-team/samba
configuration, while https://gitlab.com/samba-team/devel/samba
will still use .gitlab-ci.yml (via the legacy .gitlab-ci-private.yml).

The key point is the usage of the more powerful n1-standard-2
runners for testing.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Apr 13 09:33:14 UTC 2021 on sn-devel-184
2021-04-13 09:33:14 +00:00
Stefan Metzmacher
7387da74e6 script/autobuild.py: split samba-ad-dc-4* tests into two
As single job they used more than 1h.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2021-04-13 08:23:35 +00:00
Stefan Metzmacher
6f5546ae64 script/autobuild.py: split samba-nopython out of samba-minimal-smbd again
This was using more than 1h as a single job.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2021-04-13 08:23:35 +00:00
Stefan Metzmacher
95a9c3b295 script/autobuild.py: split samba-no-opath into two tests
This was is basically a combination of 'samba-nt4' and
'samba-fileserver'.

As a single job it used more than 1h only for testing,
while the samba-no-nopath-build uses ~ 10mins (with a filled ccache).
Now we have two test jobs with ~ 30mins.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2021-04-13 08:23:35 +00:00
Stefan Metzmacher
4552279823 .gitlab-ci-main.yml: specify the image only by SAMBA_CI_JOB_IMAGE
That way we can construct the url just in one place,
we can also add SAMBA_CI_JOB_IMAGE to the ccache identifier.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2021-04-13 08:23:35 +00:00
Stefan Metzmacher
6999e080ce .gitlab-ci*.yml: only use gitlab.org shared runners if possible
We no longer fallback to our private runner, lets see how that works
out...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2021-04-13 08:23:35 +00:00
Stefan Metzmacher
a0a1988afb bootstrap/.gitlab-ci.yml: make sure we force gitlab.com runners for now
We've just added our own runners with 'docker' and 'gce'.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2021-04-13 08:23:35 +00:00
Stefan Metzmacher
23a54f4731 .gitlab-ci-main.yml: build coverity using --with-cluster-support
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2021-04-13 08:23:35 +00:00
Stefan Metzmacher
c378d4dde0 .gitlab-ci.yml: move the content to .gitlab-ci-main.yml
We introduce an indirection from
gitlab-ci.yml via .gitlab-ci-default.yml to .gitlab-ci-main.yml

We do that in order to introduce a .gitlab-ci-coverage.yml later
as that will have to use different settings in future.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
2021-04-13 08:23:35 +00:00