ci: separate location for custom builds

Previously, we published custom builds to the same bucket and docker
repository as the release-* and master builds.

This PR uses separate GCS bucket and GAR repository for builds other
than on master and release-* branches. It also removes unused dockerhub
login call.

Fixes: DEVINF-590
Epic: None
Release note: None

build/teamcity/internal/release/process/make-and-publish-build-artifacts.sh

@@ -12,7 +12,8 @@ build_name=$(git describe --tags --dirty --match=v[0-9]* 2> /dev/null || git rev
 
 # On no match, `grep -Eo` returns 1. `|| echo""` makes the script not error.
 release_branch="$(echo "$build_name" | grep -Eo "^v[0-9]+\.[0-9]+" || echo"")"
-is_custom_build="$(echo "$TC_BUILD_BRANCH" | grep -Eo "^custombuild-" || echo "")"
+is_customized_build="$(echo "$TC_BUILD_BRANCH" | grep -Eo "^custombuild-" || echo "")"
+is_release_build="$(echo "$TC_BUILD_BRANCH" | grep -Eo "^(release-[0-9][0-9]\.[0-9](\.0)?)$|master$" || echo "")"
 
 if [[ -z "${DRY_RUN}" ]] ; then
   gcs_bucket="cockroach-builds-artifacts-prod"
@@ -22,6 +23,12 @@ if [[ -z "${DRY_RUN}" ]] ; then
   gcr_hostname="us-docker.pkg.dev"
   # export the variable to avoid shell escaping
   export gcs_credentials="$GCS_CREDENTIALS_PROD"
+  # Customized builds are published to a separate bucket and docket repository
+  # The credentials set on customized builds won't allow publishing to other locations.
+  if [[ -z "${is_release_build}" ]] ; then
+    gcs_bucket="cockroach-customized-builds-artifacts-prod"
+    gcr_repository="us-docker.pkg.dev/cockroach-cloud-images/cockroachdb-customized/cockroach-customized"
+  fi
 else
   gcs_bucket="cockroach-builds-artifacts-dryrun"
   google_credentials="$GOOGLE_COCKROACH_RELEASE_CREDENTIALS"
@@ -31,15 +38,15 @@ else
   # export the variable to avoid shell escaping
   export gcs_credentials="$GCS_CREDENTIALS_DEV"
 fi
-download_prefix="https://storage.googleapis.com/$gcs_bucket"
 
 cat << EOF
 
-  build_name:      $build_name
-  release_branch:  $release_branch
-  is_custom_build: $is_custom_build
-  gcs_bucket:      $gcs_bucket
-  gcr_repository:  $gcr_repository
+  build_name:          $build_name
+  release_branch:      $release_branch
+  is_customized_build: $is_customized_build
+  gcs_bucket:          $gcs_bucket
+  gcr_repository:      $gcr_repository
+  is_release_build:    $is_release_build
 
 EOF
 tc_end_block "Variable Setup"
@@ -64,7 +71,6 @@ EOF
 tc_end_block "Compile and publish artifacts"
 
 tc_start_block "Make and push multiarch docker images"
-configure_docker_creds
 docker_login_with_google
 
 gcr_tag="${gcr_repository}:${build_name}"

build/teamcity/internal/release/process/make-and-publish-build-tagging.sh

@@ -12,13 +12,17 @@ build_name=$(git describe --tags --dirty --match=v[0-9]* 2> /dev/null || git rev
 
 # On no match, `grep -Eo` returns 1. `|| echo""` makes the script not error.
 release_branch="$(echo "$build_name" | grep -Eo "^v[0-9]+\.[0-9]+" || echo"")"
-is_custom_build="$(echo "$TC_BUILD_BRANCH" | grep -Eo "^custombuild-" || echo "")"
+is_release_build="$(echo "$TC_BUILD_BRANCH" | grep -Eo "^(release-[0-9][0-9]\.[0-9](\.0)?)$" || echo "")"
+is_customized_build="$(echo "$TC_BUILD_BRANCH" | grep -Eo "^custombuild-" || echo "")"
+github_ssh_key="${GITHUB_COCKROACH_TEAMCITY_PRIVATE_SSH_KEY}"
 
 if [[ -z "${DRY_RUN}" ]] ; then
-  google_credentials=$GOOGLE_COCKROACH_CLOUD_IMAGES_COCKROACHDB_CREDENTIALS
-  gcr_repository="us-docker.pkg.dev/cockroach-cloud-images/cockroachdb/cockroach"
-  # Used for docker login for gcloud
-  gcr_hostname="us-docker.pkg.dev"
+  if [[ -z "${is_customized_build}" ]] ; then
+    google_credentials=$GOOGLE_COCKROACH_CLOUD_IMAGES_COCKROACHDB_CREDENTIALS
+    gcr_repository="us-docker.pkg.dev/cockroach-cloud-images/cockroachdb/cockroach"
+    # Used for docker login for gcloud
+    gcr_hostname="us-docker.pkg.dev"
+  fi
 else
   google_credentials="$GOOGLE_COCKROACH_RELEASE_CREDENTIALS"
   gcr_repository="us.gcr.io/cockroach-release/cockroach-test"
@@ -28,39 +32,39 @@ fi
 
 cat << EOF
 
-  build_name:      $build_name
-  release_branch:  $release_branch
-  is_custom_build: $is_custom_build
-  gcr_repository:  $gcr_repository
+  build_name:          $build_name
+  release_branch:      $release_branch
+  is_customized_build: $is_customized_build
+  gcr_repository:      $gcr_repository
 
 EOF
 tc_end_block "Variable Setup"
 
-
-tc_start_block "Tag the release"
-git tag "${build_name}"
-tc_end_block "Tag the release"
-
-tc_start_block "Push release tag to github.com/cockroachlabs/release-staging"
-github_ssh_key="${GITHUB_COCKROACH_TEAMCITY_PRIVATE_SSH_KEY}"
 configure_git_ssh_key
-git_wrapped push ssh://[email protected]/cockroachlabs/release-staging.git "${build_name}"
-tc_end_block "Push release tag to github.com/cockroachlabs/release-staging"
-
 
-tc_start_block "Tag docker image as latest-build"
-# Only tag the image as "latest-vX.Y-build" if the tag is on a release branch
-# (or master for the alphas for the next major release).
-if [[ -n "${release_branch}" ]] ; then
-  log_into_gcloud
-  gcloud container images add-tag "${gcr_repository}:${build_name}" "${gcr_repository}:latest-${release_branch}-build"
-fi
-if [[ "$TC_BUILD_BRANCH" == "master" ]]; then
-  log_into_gcloud
-  gcloud container images add-tag "${gcr_repository}:${build_name}" "${gcr_repository}:latest-master-build"
-fi
+if [[ -z "${is_customized_build}" ]] ; then
+  tc_start_block "Tag the release"
+  git tag "${build_name}"
+  tc_end_block "Tag the release"
+
+  tc_start_block "Push release tag to github.com/cockroachlabs/release-staging"
+  git_wrapped push ssh://[email protected]/cockroachlabs/release-staging.git "${build_name}"
+  tc_end_block "Push release tag to github.com/cockroachlabs/release-staging"
+
+
+  tc_start_block "Tag docker image as latest-build"
+  # Only tag the image as "latest-vX.Y-build" if the tag is on a release branch
+  # (or master for the alphas for the next major release).
+  if [[ -n "${is_release_build}" ]] ; then
+    log_into_gcloud
+    gcloud container images add-tag "${gcr_repository}:${build_name}" "${gcr_repository}:latest-${release_branch}-build"
+  fi
+  if [[ "$TC_BUILD_BRANCH" == "master" ]]; then
+    log_into_gcloud
+    gcloud container images add-tag "${gcr_repository}:${build_name}" "${gcr_repository}:latest-master-build"
+  fi
 tc_end_block "Tag docker image as latest-build"
-
+fi
 
 # Make finding the tag name easy.
 cat << EOF
@@ -72,7 +76,7 @@ Build ID: ${build_name}
 EOF
 
 
-if [[ -n "${is_custom_build}" ]] ; then
+if [[ -n "${is_customized_build}" ]] ; then
   tc_start_block "Delete custombuild tag"
   git_wrapped push ssh://[email protected]/cockroachdb/cockroach.git --delete "${TC_BUILD_BRANCH}"
   tc_end_block "Delete custombuild tag"