diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f366b692b4ec8ff80d7566c42361d45bc4eac14_Q09OVFJJQlVUSU5HLm1k..f1d32a07f0dc76a3786c3079c20abc53c2cca4c0_Q09OVFJJQlVUSU5HLm1k 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -166,11 +166,10 @@ ## Unofficial packaging point of contact -The omnibus-gitlab project is a project used for building official GitLab packages. -There are multiple community driven projects for packaging, such as [GitLab CE unofficial Debian 9](https://packages.debian.org/stretch/gitlab) package. - -If you are a maintainer or point of contact for a such project, and you require -assistance or just want to talk about GitLab, please raise [an issue in the omnibus-gitlab project](https://gitlab.com/gitlab-org/omnibus-gitlab/issues). +The omnibus-gitlab project is a project used for building official GitLab +packages. If you are a maintainer or point of contact for a such project, and +you require assistance or just want to talk about GitLab, please raise +[an issue in the omnibus-gitlab project](https://gitlab.com/gitlab-org/omnibus-gitlab/issues). ## Code of conduct diff --git a/files/gitlab-cookbooks/package/libraries/omnibus_helper.rb b/files/gitlab-cookbooks/package/libraries/omnibus_helper.rb index 1f366b692b4ec8ff80d7566c42361d45bc4eac14_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9vbW5pYnVzX2hlbHBlci5yYg==..f1d32a07f0dc76a3786c3079c20abc53c2cca4c0_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9vbW5pYnVzX2hlbHBlci5yYg== 100644 --- a/files/gitlab-cookbooks/package/libraries/omnibus_helper.rb +++ b/files/gitlab-cookbooks/package/libraries/omnibus_helper.rb @@ -197,7 +197,7 @@ message = <<~EOS Your OS, #{os_string}, will be deprecated soon. Starting with #{deprecated_os[matching_list.first]}, packages will not be built for it. - Switch or upgrade to a supported OS, see https://docs.gitlab.com/omnibus/package-information/deprecated_os.html for more information. + Switch or upgrade to a supported OS, see https://docs.gitlab.com/ee/administration/package_information/supported_os.html for more information. EOS LoggingHelper.deprecation(message) diff --git a/gitlab-ci-config/check-packages.yml b/gitlab-ci-config/check-packages.yml index 1f366b692b4ec8ff80d7566c42361d45bc4eac14_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw=..f1d32a07f0dc76a3786c3079c20abc53c2cca4c0_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw= 100644 --- a/gitlab-ci-config/check-packages.yml +++ b/gitlab-ci-config/check-packages.yml @@ -72,9 +72,6 @@ extends: .apt-install tags: - docker-arm-builder -Debian-9-check: - image: "${BUILDER_IMAGE_REGISTRY}/debian_9:${BUILDER_IMAGE_REVISION}" - extends: .apt-install Debian-10-check: image: "${BUILDER_IMAGE_REGISTRY}/debian_10:${BUILDER_IMAGE_REVISION}" extends: .apt-install diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml index 1f366b692b4ec8ff80d7566c42361d45bc4eac14_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..f1d32a07f0dc76a3786c3079c20abc53c2cca4c0_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644 --- a/gitlab-ci-config/dev-gitlab-org.yml +++ b/gitlab-ci-config/dev-gitlab-org.yml @@ -559,9 +559,6 @@ image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04:${BUILDER_IMAGE_REVISION}" extends: .branch_template -Debian-9-branch: - image: "${BUILDER_IMAGE_REGISTRY}/debian_9:${BUILDER_IMAGE_REVISION}" - <<: *branch_build Debian-10-branch: image: "${BUILDER_IMAGE_REGISTRY}/debian_10:${BUILDER_IMAGE_REVISION}" <<: *branch_build @@ -791,9 +788,6 @@ <<: *dev-tag-and-nightly ### Package builds -Debian-9: - image: "${BUILDER_IMAGE_REGISTRY}/debian_9:${BUILDER_IMAGE_REVISION}" - <<: *tag_build Debian-10: image: "${BUILDER_IMAGE_REGISTRY}/debian_10:${BUILDER_IMAGE_REVISION}" <<: *tag_build @@ -879,13 +873,6 @@ retry: 1 ### Staging uploads -Debian-9-staging: - needs: - - job: Debian-9 - optional: true - - job: Debian-9-branch - optional: true - <<: *staging_upload Debian-10-staging: needs: - job: Debian-10 @@ -1021,10 +1008,6 @@ needs: - Ubuntu-20.04-arm <<: *production_release -Debian-9-release: - needs: - - Debian-9 - <<: *production_release Debian-10-release: needs: - Debian-10 diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml index 1f366b692b4ec8ff80d7566c42361d45bc4eac14_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA==..f1d32a07f0dc76a3786c3079c20abc53c2cca4c0_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA== 100644 --- a/gitlab-ci-config/gitlab-com.yml +++ b/gitlab-ci-config/gitlab-com.yml @@ -402,7 +402,6 @@ Centos 7 knapsack: *prepare_knapsack Centos 8 knapsack: *prepare_knapsack -Debian 9 knapsack: *prepare_knapsack Debian 10 knapsack: *prepare_knapsack Debian 11 knapsack: *prepare_knapsack OpenSUSE 15.3 knapsack: *prepare_knapsack @@ -442,12 +441,6 @@ parallel: 6 needs: - Ubuntu 20.04 knapsack -Debian 9 specs : - image: "registry.gitlab.com/gitlab-org/gitlab-build-images:omnibus-gitlab-stretch" - extends: .chef_spec_template - parallel: 6 - needs: - - Debian 9 knapsack Debian 10 specs : image: "registry.gitlab.com/gitlab-org/gitlab-build-images:omnibus-gitlab-buster" extends: .chef_spec_template