Skip to content

Commit e595415

Browse files
Merge pull request #557 from thaJeztah/xenial_eol
[master] remove Ubuntu 16.04 Xenial, Fedora 32 (both EOL)
2 parents bf33229 + e04189e commit e595415

File tree

6 files changed

+5
-74
lines changed

6 files changed

+5
-74
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ def branch = env.CHANGE_TARGET ?: env.BRANCH_NAME
44

55
test_steps = [
66
'deb': { ->
7-
stage('Ubuntu Xenial and Focal Package') {
7+
stage('Ubuntu and Debian Package') {
88
wrappedNode(label: 'ubuntu-2004 && x86_64', cleanWorkspace: true) {
99
try {
1010
checkout scm
1111
sh "make REF=$branch checkout"
12-
sh "make -C deb ubuntu-xenial ubuntu-focal ubuntu-hirsute debian-bullseye"
12+
sh "make -C deb ubuntu-focal ubuntu-hirsute debian-bullseye"
1313
} finally {
1414
sh "make clean"
1515
}

deb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN?=docker run --rm \
4040
debbuild-$@/$(ARCH)
4141

4242
DEBIAN_VERSIONS ?= debian-buster debian-bullseye
43-
UBUNTU_VERSIONS ?= ubuntu-xenial ubuntu-bionic ubuntu-focal ubuntu-groovy ubuntu-hirsute
43+
UBUNTU_VERSIONS ?= ubuntu-bionic ubuntu-focal ubuntu-groovy ubuntu-hirsute
4444
RASPBIAN_VERSIONS ?= raspbian-buster raspbian-bullseye
4545
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
4646

deb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ make ubuntu
2929

3030
## Specifying a specific distro version
3131
```shell
32-
make ubuntu-xenial
32+
make ubuntu-focal
3333
```
3434

3535
## Building the for all distros

deb/ubuntu-xenial/Dockerfile

Lines changed: 0 additions & 36 deletions
This file was deleted.

rpm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ RUN?=docker run --rm \
5050
$(RUN_FLAGS) \
5151
rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
5252

53-
FEDORA_RELEASES ?= fedora-34 fedora-33 fedora-32
53+
FEDORA_RELEASES ?= fedora-34 fedora-33
5454
CENTOS_RELEASES ?= centos-7 centos-8
5555
ifeq ($(ARCH),s390x)
5656
RHEL_RELEASES ?= rhel-7

rpm/fedora-32/Dockerfile

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)