revert me

.github/matrix-commitly.yml

@@ -1,24 +1,146 @@
-# please see matrix-full.yml for meaning of each field
 build-packages:
+# label: used to distinguish artifacts for later use
+# image: docker image name if the build is running in side a container
+# package: package type
+# package-type: the nfpm packaging target, //:kong_{package} target; only used when package is rpm
+# bazel-args: additional bazel build flags
+# check-manifest-suite: the check manifest suite as defined in scripts/explain_manifest/config.py
+
+# Ubuntu
+- label: ubuntu-20.04
+  image: ubuntu:20.04
+  package: deb
+  check-manifest-suite: ubuntu-20.04-amd64
 - label: ubuntu-22.04
-  os: ubuntu-22.04
   package: deb
   check-manifest-suite: ubuntu-22.04-amd64
 
+# Debian
+- label: debian-10
+  image: debian:10
+  package: deb
+  check-manifest-suite: debian-10-amd64
+- label: debian-11
+  image: debian:11
+  package: deb
+  check-manifest-suite: debian-11-amd64
+
+# Alpine
+- label: alpine
+  os: vars.RELEASE_RUNS_ON
+  package: apk
+  bazel-args: --platforms=//:alpine-crossbuild-x86_64
+  check-manifest-suite: alpine-amd64
+
+# CentOS
+- label: centos-7
+  os: vars.RELEASE_RUNS_ON
+  image: centos:7
+  package: rpm
+  package-type: el7
+  check-manifest-suite: el7-amd64
+
+# RHEL
+- label: rhel-7
+  image: centos:7
+  package: rpm
+  package-type: el7
+  check-manifest-suite: el7-amd64
+- label: rhel-8
+  image: rockylinux:8
+  package: rpm
+  package-type: el8
+  check-manifest-suite: el8-amd64
+
+  # Amazon Linux
+- label: amazonlinux-2
+  image: amazonlinux:2
+  package: rpm
+  package-type: aws2
+  check-manifest-suite: amazonlinux-2-amd64
+- label: amazonlinux-2023
+  image: amazonlinux:2023
+  package: rpm
+  package-type: aws2023
+  check-manifest-suite: amazonlinux-2023-amd64
+
 build-images:
+# Only build images for the latest version of each major release.
+
+# label: used as compose docker image label ${github.sha}-${label}
+# base-image: docker image to use as base
+# package: package type
+# artifact-from: label of build-packages to use
+# artifact-from-alt: another label of build-packages to use for downloading package (to build multi-arch image)
+# docker-platforms: comma separated list of docker buildx platforms to build for
+
+# Ubuntu
 - label: ubuntu
   base-image: ubuntu:22.04
   package: deb
   artifact-from: ubuntu-22.04
+  docker-platforms: linux/amd64
+
+# Centos
+- label: centos7
+  base-image: centos:7
+  package: rpm
+  package-distro: el7
+  artifact-from: centos-7
+
+- label: rhel7
+  base-image: centos:7
+  package: rpm
+  package-distro: el7
+  artifact-from: rhel-7
+
+# Alpine
+- label: alpine
+  base-image: alpine:3.16
+  package: apk
+  artifact-from: alpine
+# Debian
+- label: debian
+  base-image: debian:11-slim
+  package: deb
+  artifact-from: debian-11
+
+# RHEL
+- label: rhel
+  base-image: centos:7
+  package: rpm
+  rpm_platform: el7
+  artifact-from: rhel-7
+  docker-platforms: linux/amd64
 
 smoke-tests:
 - label: ubuntu
+- label: debian
+- label: rhel
+- label: alpine
 
 scan-vulnerabilities:
 - label: ubuntu
+- label: debian
+- label: rhel
+- label: alpine
 
 release-packages:
+# CentOS
+- label: centos-7
+  package: rpm
+  artifact-from: centos-7
+  artifact-version: 7
+  artifact-type: centos
+  artifact: kong.el7.amd64.rpm
 
 release-images:
+- label: centos7
+  package: rpm
+- label: rhel7
+  package: rpm
+- label: alpine
+  package: apk
 - label: ubuntu
-  package: deb
+- label: debian
+- label: rhel

.github/workflows/release.yml

@@ -579,7 +579,6 @@ jobs:
     runs-on: ubuntu-22.04
     if: fromJSON(needs.metadata.outputs.matrix)['release-packages'] != ''
     timeout-minutes: 5 # PULP takes a while to publish
-    environment: release
 
     strategy:
       # limit to 3 jobs at a time
@@ -626,6 +625,7 @@ jobs:
         # note: release-scripts rejects user tags if missing internal flag
         #
         # this can be a comma-sepratated list of tags to apply
+        echo "!!!!!!!!!!!!!!!!!! [$OFFICIAL_RELEASE]     [$INPUT_VERSION]"
         if [[ "$OFFICIAL_RELEASE" == 'false' ]]; then
           if echo "$INPUT_VERSION" | grep -qs -E 'rc|alpha|beta|nightly'; then
             PACKAGE_TAGS="$INPUT_VERSION"

scripts/release-kong.sh

@@ -61,6 +61,7 @@ function with_backoff {
 }
 
 # TODO: remove this once we have a better way to determine if we are releasing
+echo "!!!!!!!!! ARTIFACT_TYPE: $ARTIFACT_TYPE"
 case "$ARTIFACT_TYPE" in
   debian|ubuntu)
     OUTPUT_FILE_SUFFIX=".$ARTIFACT_VERSION.$ARCHITECTURE.deb"
@@ -147,6 +148,10 @@ function push_package () {
           --major-version "${KONG_VERSION%%.*}.x" \
           $release_args
 
+  echo "!!!!!!!!!!!!! logs:"
+  id=`docker ps -a|cut -d ' ' -f 1|head -n 2 |tail -n -1`
+  docker logs $id
+
   if [[ $? -ne 0 ]]; then
     exit 1
   fi