diff --git a/.common-ci.yml b/.common-ci.yml index b3f79222..569b5d05 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -85,13 +85,6 @@ stages: CVE_UPDATES: "cyrus-sasl-lib" PACKAGE_REPO_TYPE: rpm -.dist-ubuntu16.04: - rules: - - !reference [.main-or-manual, rules] - variables: - DIST: ubuntu16.04 - PACKAGE_REPO_TYPE: debian - .dist-ubuntu18.04: variables: DIST: ubuntu18.04 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 322f7fa5..121eebe7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,18 +158,6 @@ package-opensuse-leap15.1-x86_64: - .dist-opensuse-leap15.1 - .arch-x86_64 -package-ubuntu16.04-amd64: - extends: - - .package-build - - .dist-ubuntu16.04 - - .arch-amd64 - -package-ubuntu16.04-ppc64le: - extends: - - .package-build - - .dist-ubuntu16.04 - - .arch-ppc64le - package-ubuntu18.04-amd64: extends: - .package-build @@ -282,10 +270,6 @@ image-packaging: optional: true - job: package-opensuse-leap15.1-x86_64 optional: true - - job: package-ubuntu16.04-amd64 - optional: true - - job: package-ubuntu16.04-ppc64le - optional: true - job: package-ubuntu18.04-ppc64le optional: true diff --git a/build/container/Makefile b/build/container/Makefile index 7a7c0ef2..522b51f9 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -143,8 +143,6 @@ test-packaging: @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/x86_64" || echo "Missing centos8/x86_64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/debian10/amd64" || echo "Missing debian10/amd64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/opensuse-leap15.1/x86_64" || echo "Missing opensuse-leap15.1/x86_64" - @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/amd64" || echo "Missing ubuntu16.04/amd64" - @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/ppc64le" || echo "Missing ubuntu16.04/ppc64le" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/amd64" || echo "Missing ubuntu18.04/amd64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/arm64" || echo "Missing ubuntu18.04/arm64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/ppc64le" || echo "Missing ubuntu18.04/ppc64le" diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index 5eb1bdbb..1a753b34 100755 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -38,8 +38,6 @@ all=( fedora35-aarch64 fedora35-x86_64 opensuse-leap15.1-x86_64 - ubuntu16.04-amd64 - ubuntu16.04-ppc64le ubuntu18.04-amd64 ubuntu18.04-arm64 ubuntu18.04-ppc64le diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh index 37f2528a..a0877b3a 100755 --- a/scripts/release-packages.sh +++ b/scripts/release-packages.sh @@ -167,8 +167,6 @@ all=( fedora35-aarch64 fedora35-x86_64 opensuse-leap15.1-x86_64 - ubuntu16.04-amd64 - ubuntu16.04-ppc64le ubuntu18.04-amd64 ubuntu18.04-arm64 ubuntu18.04-ppc64le