diff --git a/Makefile b/Makefile index 3469d9cc9..31cac1231 100644 --- a/Makefile +++ b/Makefile @@ -273,9 +273,12 @@ release-kong: test RESTY_IMAGE_TAG=$(RESTY_IMAGE_TAG) \ KONG_PACKAGE_NAME=$(KONG_PACKAGE_NAME) \ KONG_VERSION=$(KONG_VERSION) \ - PULP_USR=$(PULP_USR) \ - PULP_PSW=$(PULP_PSW) \ - PULP_HOST=$(PULP_HOST) \ + PULP_PROD_USR=$(PULP_USR) \ + PULP_PROD_PSW=$(PULP_PSW) \ + PULP_HOST_PROD=$(PULP_HOST) \ + PULP_STAGE_USR=$(PULP_USR) \ + PULP_STAGE_PSW=$(PULP_PSW) \ + PULP_HOST_STAGE=$(PULP_HOST) \ PRIVATE_REPOSITORY=$(PRIVATE_REPOSITORY) \ RELEASE_DOCKER_ONLY=$(RELEASE_DOCKER_ONLY) \ OFFICIAL_RELEASE=$(OFFICIAL_RELEASE) \ @@ -292,9 +295,12 @@ ifeq ($(BUILDX),true) RESTY_IMAGE_TAG=$(RESTY_IMAGE_TAG) \ KONG_PACKAGE_NAME=$(KONG_PACKAGE_NAME) \ KONG_VERSION=$(KONG_VERSION) \ - PULP_USR=$(PULP_USR) \ - PULP_PSW=$(PULP_PSW) \ - PULP_HOST=$(PULP_HOST) \ + PULP_PROD_USR=$(PULP_USR) \ + PULP_PROD_PSW=$(PULP_PSW) \ + PULP_HOST_PROD=$(PULP_HOST) \ + PULP_STAGE_USR=$(PULP_USR) \ + PULP_STAGE_PSW=$(PULP_PSW) \ + PULP_HOST_STAGE=$(PULP_HOST) \ PRIVATE_REPOSITORY=$(PRIVATE_REPOSITORY) \ RELEASE_DOCKER_ONLY=$(RELEASE_DOCKER_ONLY) \ OFFICIAL_RELEASE=$(OFFICIAL_RELEASE) \ diff --git a/release-kong.sh b/release-kong.sh index ba40811c7..9c7cd9979 100755 --- a/release-kong.sh +++ b/release-kong.sh @@ -5,9 +5,23 @@ set -eo pipefail CWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) BUILD_DIR="$CWD/output" +PULP_HOST= +PULP_USERNAME= +PULP_PASSWORD= + +# release finals into prod, others into stage +if [[ "$KONG_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + PULP_HOST="$PULP_HOST_PROD" + PULP_USERNAME="$PULP_PROD_USR" + PULP_PASSWORD="$PULP_PROD_PSW" +else + PULP_HOST="$PULP_HOST_STAGE" + PULP_USERNAME="$PULP_STAGE_USR" + PULP_PASSWORD="$PULP_STAGE_PSW" +fi + + -PULP_USERNAME="$PULP_USR" -PULP_PASSWORD="$PULP_PSW" PULP_DOCKER_IMAGE="kong/release-script"