sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

gitlab-ci: Remove Fedora 29 which is already EOL

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2020-03-19 10:23:02 +01:00 committed by Andreas Schneider
parent 639e64d30d
commit 087566641e
9 changed files with 2 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -22,7 +22,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
SAMBA_CI_CONTAINER_TAG: 6bb2eeaf8203467d9a93a722071b0f081027410e
SAMBA_CI_CONTAINER_TAG: 2366db8ea66e6a07f36b77c0f3152a06e7056adc
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@ -39,7 +39,6 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_debian10: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian10:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_opensuse151: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse151:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_fedora30: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora30:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_fedora31: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora31:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG}
@ -299,10 +298,6 @@ centos8-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_centos8
fedora29-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_fedora29
fedora30-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_fedora30

3
bootstrap/.gitlab-ci.yml
View File

@ -102,9 +102,6 @@ fedora31:
fedora30:
extends: .build_image_template
fedora29:
extends: .build_image_template
centos8:
extends: .build_image_template

9
bootstrap/config.py
View File

@ -453,15 +453,6 @@ RPM_DISTS = {
'liburing-devel': '', # not available yet, Add me back, once available!
}
},
'fedora29': {
'docker_image': 'fedora:29',
'vagrant_box': 'fedora/29-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
'replace': {
'lsb-release': 'redhat-lsb',
'liburing-devel': '', # not available
}
},
'fedora30': {
'docker_image': 'fedora:30',
'vagrant_box': 'fedora/30-cloud-base',

7
bootstrap/generated-dists/Vagrantfile vendored
View File

@ -31,13 +31,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "debian10/locale.sh"
end
config.vm.define "fedora29" do |v|
v.vm.box = "fedora/29-cloud-base"
v.vm.hostname = "fedora29"
v.vm.provision :shell, path: "fedora29/bootstrap.sh"
v.vm.provision :shell, path: "fedora29/locale.sh"
end
config.vm.define "fedora30" do |v|
v.vm.box = "fedora/30-cloud-base"
v.vm.hostname = "fedora30"

27
bootstrap/generated-dists/fedora29/Dockerfile
View File

@ -1,27 +0,0 @@
#
# This file is generated by 'bootstrap/template.py --render'
# See also bootstrap/config.py
#
FROM fedora:29
# pass in with --build-arg while build
ARG SHA1SUM
RUN [ -n $SHA1SUM ] && echo $SHA1SUM > /sha1sum.txt
ADD *.sh /tmp/
# need root permission, do it before USER samba
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
mkdir -p /etc/sudoers.d && \
echo "samba ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/samba
USER samba
WORKDIR /home/samba
# samba tests rely on this
ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8

108
bootstrap/generated-dists/fedora29/bootstrap.sh
View File

@ -1,108 +0,0 @@
#!/bin/bash
#
# This file is generated by 'bootstrap/template.py --render'
# See also bootstrap/config.py
#
set -xueo pipefail
dnf update -y
dnf install -y \
--setopt=install_weak_deps=False \
@development-tools \
acl \
attr \
autoconf \
avahi-devel \
bind-utils \
binutils \
bison \
chrpath \
cups-devel \
curl \
dbus-devel \
docbook-dtds \
docbook-style-xsl \
flex \
gawk \
gcc \
gdb \
git \
glib2-devel \
glibc-common \
glibc-langpack-en \
glusterfs-api-devel \
glusterfs-devel \
gnutls-devel \
gpgme-devel \
gzip \
hostname \
htop \
jansson-devel \
keyutils-libs-devel \
krb5-devel \
krb5-server \
lcov \
libacl-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \
libbsd-devel \
libcap-devel \
libcephfs-devel \
libicu-devel \
libnsl2-devel \
libpcap-devel \
libsemanage-python \
libtasn1-devel \
libtasn1-tools \
libtirpc-devel \
libunwind-devel \
libuuid-devel \
libxslt \
lmdb \
lmdb-devel \
make \
mingw64-gcc \
ncurses-devel \
openldap-devel \
pam-devel \
patch \
perl \
perl-Archive-Tar \
perl-ExtUtils-MakeMaker \
perl-JSON-Parse \
perl-Parse-Yapp \
perl-Test-Base \
perl-generators \
perl-interpreter \
pkgconfig \
policycoreutils-python \
popt-devel \
procps-ng \
psmisc \
python3 \
python3-devel \
python3-dns \
python3-gpg \
python3-markdown \
quota-devel \
readline-devel \
redhat-lsb \
rng-tools \
rpcgen \
rpcsvc-proto-devel \
rsync \
sed \
sudo \
systemd-devel \
tar \
tree \
which \
xfsprogs-devel \
yum-utils \
zlib-devel
dnf clean all

55
bootstrap/generated-dists/fedora29/locale.sh
View File

@ -1,55 +0,0 @@
#!/bin/bash
#
# This file is generated by 'bootstrap/template.py --render'
# See also bootstrap/config.py
#
set -xueo pipefail
# refer to /usr/share/i18n/locales
INPUTFILE=en_US
# refer to /usr/share/i18n/charmaps
CHARMAP=UTF-8
# locale to generate in /usr/lib/locale
# glibc/localedef will normalize UTF-8 to utf8, follow the naming style
LOCALE=$INPUTFILE.utf8
# if locale is already correct, exit
( locale | grep LC_ALL | grep -i $LOCALE ) && exit 0
# if locale not available, generate locale into /usr/lib/locale
if ! ( locale --all-locales | grep -i $LOCALE )
then
# no-archive means create its own dir
localedef --inputfile $INPUTFILE --charmap $CHARMAP --no-archive $LOCALE
fi
# update locale conf and global env file
# set both LC_ALL and LANG for safe
# update conf for Debian family
FILE=/etc/default/locale
if [ -f $FILE ]
then
echo LC_ALL="$LOCALE" > $FILE
echo LANG="$LOCALE" >> $FILE
fi
# update conf for RedHat family
FILE=/etc/locale.conf
if [ -f $FILE ]
then
# LC_ALL is not valid in this file, set LANG only
echo LANG="$LOCALE" > $FILE
fi
# update global env file
FILE=/etc/environment
if [ -f $FILE ]
then
# append LC_ALL if not exist
grep LC_ALL $FILE || echo LC_ALL="$LOCALE" >> $FILE
# append LANG if not exist
grep LANG $FILE || echo LANG="$LOCALE" >> $FILE
fi

95
bootstrap/generated-dists/fedora29/packages.yml
View File

@ -1,95 +0,0 @@
---
packages:
- @development-tools
- acl
- attr
- autoconf
- avahi-devel
- bind-utils
- binutils
- bison
- chrpath
- cups-devel
- curl
- dbus-devel
- docbook-dtds
- docbook-style-xsl
- flex
- gawk
- gcc
- gdb
- git
- glib2-devel
- glibc-common
- glibc-langpack-en
- glusterfs-api-devel
- glusterfs-devel
- gnutls-devel
- gpgme-devel
- gzip
- hostname
- htop
- jansson-devel
- keyutils-libs-devel
- krb5-devel
- krb5-server
- lcov
- libacl-devel
- libarchive-devel
- libattr-devel
- libblkid-devel
- libbsd-devel
- libcap-devel
- libcephfs-devel
- libicu-devel
- libnsl2-devel
- libpcap-devel
- libsemanage-python
- libtasn1-devel
- libtasn1-tools
- libtirpc-devel
- libunwind-devel
- libuuid-devel
- libxslt
- lmdb
- lmdb-devel
- make
- mingw64-gcc
- ncurses-devel
- openldap-devel
- pam-devel
- patch
- perl
- perl-Archive-Tar
- perl-ExtUtils-MakeMaker
- perl-JSON-Parse
- perl-Parse-Yapp
- perl-Test-Base
- perl-generators
- perl-interpreter
- pkgconfig
- policycoreutils-python
- popt-devel
- procps-ng
- psmisc
- python3
- python3-devel
- python3-dns
- python3-gpg
- python3-markdown
- quota-devel
- readline-devel
- redhat-lsb
- rng-tools
- rpcgen
- rpcsvc-proto-devel
- rsync
- sed
- sudo
- systemd-devel
- tar
- tree
- which
- xfsprogs-devel
- yum-utils
- zlib-devel

2
bootstrap/sha1sum.txt
View File

@ -1 +1 @@
6bb2eeaf8203467d9a93a722071b0f081027410e
2366db8ea66e6a07f36b77c0f3152a06e7056adc