Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • lts-team/packages/samba
  • thctlo/samba-lintianfix
  • arnaudr/samba
  • jrwren/samba
  • paride/samba
  • athos/samba
  • henrich/samba
  • cnotin/samba
  • mimi89999/samba
  • samba-team/samba
  • ahasenack/samba
  • jrtc27/samba
  • noel/samba
13 results
Show changes
Commits on Source (1851)
Showing
with 210 additions and 512 deletions
......@@ -47,23 +47,25 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
SAMBA_CI_CONTAINER_TAG: b62662cd85b10ca4767b9ead4e9b0482ad98ddb2
SAMBA_CI_CONTAINER_TAG: 790c229c42a67336099420d137fa9dc9974a133a
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
# We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224
#
SAMBA_CI_CONTAINER_IMAGE: ubuntu1804
SAMBA_CI_CONTAINER_IMAGE: ubuntu2204
#
# The following images are available
# Please see the samba-o3 sections at the end of this file!
# We should run that for each available image
#
SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ubuntu1804
SAMBA_CI_CONTAINER_IMAGE_ubuntu1804_32bit: ubuntu1804-32bit
SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
SAMBA_CI_CONTAINER_IMAGE_ubuntu2204: ubuntu2204
SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153
SAMBA_CI_CONTAINER_IMAGE_fedora36: fedora36
SAMBA_CI_CONTAINER_IMAGE_f36mit120: f36mit120
SAMBA_CI_CONTAINER_IMAGE_opensuse154: opensuse154
SAMBA_CI_CONTAINER_IMAGE_fedora37: fedora37
SAMBA_CI_CONTAINER_IMAGE_f37mit120: f37mit120
SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s
......@@ -256,32 +258,34 @@ samba-def-build:
needs:
- job: samba-def-build
artifacts: true
- job: samba-shellcheck
samba-mit-build:
extends: .shared_template_build_only
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
stage: build_first
samba-mit120-build:
extends: .shared_template_build_only
variables:
AUTOBUILD_JOB_NAME: samba-mit-build
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f37mit120}
stage: build_first
.needs_samba-mit-build:
extends: .shared_template_test_only
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
needs:
- job: samba-mit-build
artifacts: true
- job: samba-shellcheck
.needs_samba-mit120-build:
extends: .shared_template_test_only
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f37mit120}
needs:
- job: samba-mit120-build
artifacts: true
......@@ -328,7 +332,7 @@ samba:
samba-mitkrb5:
extends: .shared_template
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
samba-minimal-smbd:
extends: .shared_template
......@@ -372,6 +376,7 @@ samba-libs:
samba-fuzz:
extends: .shared_template
variables:
# We match what Google is running over at oss-fuzz
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004}
ctdb:
......@@ -397,7 +402,14 @@ samba-addc-mit-4b:
samba-fips:
extends: .shared_template
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
samba-shellcheck:
extends: .shared_template
needs:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
stage: build_first
.private_test_only:
extends: .private_runner_test
......@@ -538,7 +550,7 @@ pages:
coverity:
extends: .shared_runner_build_image
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse153}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse154}
stage: build
script:
- wget https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O /tmp/coverity_tool.tgz
......@@ -567,6 +579,12 @@ coverity:
paths:
- cov-int/*.txt
ubuntu1804-samba-32bit:
extends: .shared_template
variables:
AUTOBUILD_JOB_NAME: samba-32bit
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu1804_32bit}
#
# We build samba-o3 on all supported distributions
#
......@@ -615,15 +633,20 @@ ubuntu2004-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004}
ubuntu2204-samba-o3:
extends: .samba-o3-template
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2204}
debian11-samba-o3:
extends: .samba-o3-template
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11}
opensuse153-samba-o3:
opensuse154-samba-o3:
extends: .samba-o3-template
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse153}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse154}
centos7-samba-o3:
extends: .samba-o3-template
......@@ -639,10 +662,10 @@ centos8s-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
fedora36-samba-o3:
fedora37-samba-o3:
extends: .samba-o3-template
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
#
# Keep the samba-o3 sections at the end ...
......
......@@ -24,8 +24,8 @@
# -> "3.0.0" #
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=17
SAMBA_VERSION_RELEASE=2
SAMBA_VERSION_MINOR=18
SAMBA_VERSION_RELEASE=0
########################################################
# If a official release has a serious bug #
......@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
SAMBA_VERSION_RC_RELEASE=
SAMBA_VERSION_RC_RELEASE=1
########################################################
# To mark SVN snapshots this should be set to 'yes' #
......
This diff is collapsed.
......@@ -65,7 +65,7 @@ fail:
bool cli_credentials_set_cmdline_callbacks(struct cli_credentials *cred)
{
/*
* The there is no tty, then we will try to read the password from
* If there is no tty, we will try to read the password from
* stdin.
*/
return cli_credentials_set_password_callback(cred,
......
#!/usr/bin/env python
bld.SAMBA_SUBSYSTEM('KRB5_PAC',
source='gssapi_pac.c kerberos_pac.c gssapi_helper.c',
deps='gssapi_krb5 ndr-krb5pac krb5samba')
deps='gssapi ndr-krb5pac krb5samba')
---
.build_image_template:
image: quay.io/podman/stable:latest
stage: images
......@@ -91,16 +91,24 @@
ubuntu1804:
extends: .build_image_template
ubuntu1804-32bit:
extends: .build_image_template
variables:
SAMBA_CI_TEST_JOB: "samba-32bit"
ubuntu2004:
extends: .build_image_template
ubuntu2204:
extends: .build_image_template
debian11:
extends: .build_image_template
fedora36:
fedora37:
extends: .build_image_template
f36mit120:
f37mit120:
extends: .build_image_template
centos8s:
......@@ -114,5 +122,5 @@ centos7:
# We install a compat-gnutls34 package for GnuTLS >= 3.4.7
PKG_CONFIG_PATH: /usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig
opensuse153:
opensuse154:
extends: .build_image_template
......@@ -126,13 +126,15 @@ PKGS = [
('apt-utils', 'yum-utils'),
('pkg-config', 'pkgconfig'),
('procps', 'procps-ng'), # required for the free cmd in tests
('lsb-release', 'lsb-release'), # we need lsb_relase to show info
('lsb-release', 'lsb-release'), # we need lsb_release to show info
('', 'rpcgen'), # required for test
# refer: https://fedoraproject.org/wiki/Changes/SunRPCRemoval
('', 'libtirpc-devel'), # for <rpc/rpc.h> header on fedora
('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
('mawk', 'gawk'),
('', 'mold'),
('', 'ShellCheck'),
('', 'shfmt'),
('python3', 'python3'),
('python3-cryptography', 'python3-cryptography'), # for krb5 tests
......@@ -243,8 +245,7 @@ yum install -y dnf-plugins-core
yum install -y epel-release
yum -v repolist all
yum config-manager --set-enabled powertools -y || \
yum config-manager --set-enabled powertools -y
yum config-manager --set-enabled powertools -y
yum update -y
......@@ -426,6 +427,13 @@ DEB_DISTS = {
'liburing-dev': '', # not available
}
},
'ubuntu1804-32bit': {
'docker_image': 'registry-1.docker.io/i386/ubuntu:18.04',
'vagrant_box': 'ubuntu/bionic32',
'replace': {
'liburing-dev': '', # not available
}
},
'ubuntu2004': {
'docker_image': 'ubuntu:20.04',
'vagrant_box': 'ubuntu/focal64',
......@@ -433,6 +441,13 @@ DEB_DISTS = {
'liburing-dev': '', # not available
}
},
'ubuntu2204': {
'docker_image': 'ubuntu:22.04',
'vagrant_box': 'ubuntu/jammy64',
'replace': {
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
},
}
}
......@@ -472,6 +487,8 @@ RPM_DISTS = {
'python3-setproctitle': 'python36-setproctitle',
'tracker-devel': '', # do not install
'mold': '',
'ShellCheck': '',
'shfmt': '',
}
},
'centos8s': {
......@@ -487,11 +504,13 @@ RPM_DISTS = {
'perl-FindBin': '',
'liburing-devel': '', # not available yet, Add me back, once available!
'mold': '',
'ShellCheck': '',
'shfmt': '',
}
},
'fedora36': {
'docker_image': 'quay.io/fedora/fedora:36',
'vagrant_box': 'fedora/36-cloud-base',
'fedora37': {
'docker_image': 'quay.io/fedora/fedora:37',
'vagrant_box': 'fedora/37-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
'replace': {
'lsb-release': 'redhat-lsb',
......@@ -500,9 +519,9 @@ RPM_DISTS = {
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
}
},
'f36mit120': {
'docker_image': 'quay.io/fedora/fedora:36',
'vagrant_box': 'fedora/36-cloud-base',
'f37mit120': {
'docker_image': 'quay.io/fedora/fedora:37',
'vagrant_box': 'fedora/37-cloud-base',
'bootstrap': DNF_BOOTSTRAP_MIT,
'replace': {
'lsb-release': 'redhat-lsb',
......@@ -511,9 +530,9 @@ RPM_DISTS = {
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
}
},
'opensuse153': {
'docker_image': 'opensuse/leap:15.3',
'vagrant_box': 'opensuse/openSUSE-15.3-x86_64',
'opensuse154': {
'docker_image': 'opensuse/leap:15.4',
'vagrant_box': 'opensuse/openSUSE-15.4-x86_64',
'bootstrap': ZYPPER_BOOTSTRAP,
'replace': {
'@development-tools': '',
......@@ -525,7 +544,7 @@ RPM_DISTS = {
'jansson-devel': 'libjansson-devel',
'keyutils-libs-devel': 'keyutils-devel',
'krb5-workstation': 'krb5-client',
'python3-libsemanage': 'python2-semanage',
'python3-libsemanage': 'python3-semanage',
'openldap-devel': 'openldap2-devel',
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
'perl-JSON-Parse': 'perl-JSON-XS',
......@@ -540,6 +559,8 @@ RPM_DISTS = {
'glusterfs-api-devel': '',
'libtasn1-tools': '', # asn1Parser is part of libtasn1
'mold': '',
'shfmt': '',
'yum-utils': '',
}
}
}
......
......@@ -31,25 +31,25 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "debian11/locale.sh"
end
config.vm.define "f36mit120" do |v|
v.vm.box = "fedora/36-cloud-base"
v.vm.hostname = "f36mit120"
v.vm.provision :shell, path: "f36mit120/bootstrap.sh"
v.vm.provision :shell, path: "f36mit120/locale.sh"
config.vm.define "f37mit120" do |v|
v.vm.box = "fedora/37-cloud-base"
v.vm.hostname = "f37mit120"
v.vm.provision :shell, path: "f37mit120/bootstrap.sh"
v.vm.provision :shell, path: "f37mit120/locale.sh"
end
config.vm.define "fedora36" do |v|
v.vm.box = "fedora/36-cloud-base"
v.vm.hostname = "fedora36"
v.vm.provision :shell, path: "fedora36/bootstrap.sh"
v.vm.provision :shell, path: "fedora36/locale.sh"
config.vm.define "fedora37" do |v|
v.vm.box = "fedora/37-cloud-base"
v.vm.hostname = "fedora37"
v.vm.provision :shell, path: "fedora37/bootstrap.sh"
v.vm.provision :shell, path: "fedora37/locale.sh"
end
config.vm.define "opensuse153" do |v|
v.vm.box = "opensuse/openSUSE-15.3-x86_64"
v.vm.hostname = "opensuse153"
v.vm.provision :shell, path: "opensuse153/bootstrap.sh"
v.vm.provision :shell, path: "opensuse153/locale.sh"
config.vm.define "opensuse154" do |v|
v.vm.box = "opensuse/openSUSE-15.4-x86_64"
v.vm.hostname = "opensuse154"
v.vm.provision :shell, path: "opensuse154/bootstrap.sh"
v.vm.provision :shell, path: "opensuse154/locale.sh"
end
config.vm.define "ubuntu1804" do |v|
......@@ -59,6 +59,13 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "ubuntu1804/locale.sh"
end
config.vm.define "ubuntu1804-32bit" do |v|
v.vm.box = "ubuntu/bionic32"
v.vm.hostname = "ubuntu1804-32bit"
v.vm.provision :shell, path: "ubuntu1804-32bit/bootstrap.sh"
v.vm.provision :shell, path: "ubuntu1804-32bit/locale.sh"
end
config.vm.define "ubuntu2004" do |v|
v.vm.box = "ubuntu/focal64"
v.vm.hostname = "ubuntu2004"
......@@ -66,5 +73,12 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "ubuntu2004/locale.sh"
end
config.vm.define "ubuntu2204" do |v|
v.vm.box = "ubuntu/jammy64"
v.vm.hostname = "ubuntu2204"
v.vm.provision :shell, path: "ubuntu2204/bootstrap.sh"
v.vm.provision :shell, path: "ubuntu2204/locale.sh"
end
end
......@@ -12,8 +12,7 @@ yum install -y dnf-plugins-core
yum install -y epel-release
yum -v repolist all
yum config-manager --set-enabled powertools -y || \
yum config-manager --set-enabled powertools -y
yum config-manager --set-enabled powertools -y
yum update -y
......
......@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
FROM quay.io/fedora/fedora:36
FROM quay.io/fedora/fedora:37
# pass in with --build-arg while build
ARG SHA1SUM
......
......@@ -15,6 +15,7 @@ dnf update -y
dnf install -y \
--setopt=install_weak_deps=False \
@development-tools \
ShellCheck \
acl \
attr \
autoconf \
......@@ -109,6 +110,7 @@ dnf install -y \
rpcsvc-proto-devel \
rsync \
sed \
shfmt \
sudo \
systemd-devel \
tar \
......
---
packages:
- @development-tools
- ShellCheck
- acl
- attr
- autoconf
......@@ -95,6 +96,7 @@ packages:
- rpcsvc-proto-devel
- rsync
- sed
- shfmt
- sudo
- systemd-devel
- tar
......
......@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
FROM quay.io/fedora/fedora:36
FROM quay.io/fedora/fedora:37
# pass in with --build-arg while build
ARG SHA1SUM
......
......@@ -12,6 +12,7 @@ dnf update -y
dnf install -y \
--setopt=install_weak_deps=False \
@development-tools \
ShellCheck \
acl \
attr \
autoconf \
......@@ -106,6 +107,7 @@ dnf install -y \
rpcsvc-proto-devel \
rsync \
sed \
shfmt \
sudo \
systemd-devel \
tar \
......
---
packages:
- @development-tools
- ShellCheck
- acl
- attr
- autoconf
......@@ -95,6 +96,7 @@ packages:
- rpcsvc-proto-devel
- rsync
- sed
- shfmt
- sudo
- systemd-devel
- tar
......
......@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
FROM opensuse/leap:15.3
FROM opensuse/leap:15.4
# pass in with --build-arg while build
ARG SHA1SUM
......
......@@ -12,6 +12,7 @@ zypper --non-interactive update
zypper --non-interactive install \
--no-recommends \
system-user-nobody \
ShellCheck \
acl \
attr \
autoconf \
......@@ -81,7 +82,6 @@ zypper --non-interactive install \
popt-devel \
procps \
psmisc \
python2-semanage \
python3 \
python3-Markdown \
python3-cryptography \
......@@ -92,6 +92,7 @@ zypper --non-interactive install \
python3-pyasn1 \
python3-python-dateutil \
python3-requests \
python3-semanage \
python3-setproctitle \
readline-devel \
rng-tools \
......@@ -108,7 +109,6 @@ zypper --non-interactive install \
which \
xfsprogs-devel \
xz \
yum-utils \
zlib-devel
zypper --non-interactive clean
......