Add PR id to bucket URL (#1285)

Add Pull Request number as part of the bucket URL or 
the branch name (e.g. main). Artifacts uploaded in the 
pipeline have also been reviewed.

Author: mrodm

.buildkite/pipeline.trigger.integration.tests.sh

@@ -42,9 +42,8 @@ for test in ${CHECK_PACKAGES_TESTS[@]}; do
     echo "          provider: \"gcp\""
     echo "        artifact_paths:"
     echo "          - build/test-results/*.xml"
-    echo "          - build/elastic-stack-dump/stack/check-*/logs/*.log"
-    echo "          - build/elastic-stack-dump/stack/check-*/logs/fleet-server-internal/**/*"
-    echo "          - build/elastic-stack-status/*/*"
+    echo "          - build/elastic-stack-dump/check-*/logs/*.log"
+    echo "          - build/elastic-stack-dump/check-*/logs/fleet-server-internal/**/*"
     if [[ $test =~ with-kind$ ]]; then
         echo "          - build/kubectl-dump.txt"
     fi
@@ -62,8 +61,6 @@ for package in $(find . -maxdepth 1 -mindepth 1 -type d) ; do
     echo "          provider: \"gcp\""
     echo "        artifact_paths:"
     echo "          - build/test-results/*.xml"
-    echo "          - build/elastic-stack-dump/stack/check-*/logs/*.log"
-    echo "          - build/elastic-stack-dump/stack/check-*/logs/fleet-server-internal/**/*"
 done
 
 popd > /dev/null

.buildkite/scripts/integration_tests.sh

@@ -30,9 +30,8 @@ GOOGLE_CREDENTIALS_FILENAME="google-cloud-credentials.json"
 
 JOB_GCS_BUCKET_INTERNAL="fleet-ci-temp-internal"
 
-REPO_NAME=$(repoName "${BUILDKITE_REPO}")
-REPO_BUILD_TAG="${REPO_NAME}/${BUILDKITE_BUILD_NUMBER}"
-
+REPO_NAME=$(repo_name "${BUILDKITE_REPO}")
+REPO_BUILD_TAG="${REPO_NAME}/$(buildkite_pr_branch_build_id)"
 TARGET=""
 PACKAGE=""
 while getopts ":t:p:h" o; do

.buildkite/scripts/signAndPublishPackage.sh

@@ -16,7 +16,7 @@ cleanup() {
 
 trap cleanup EXIT
 
-isAlreadyPublished() {
+is_already_published() {
     local packageZip=$1
 
     if curl -s --head https://package-storage.elastic.co/artifacts/packages/${packageZip} | grep -q "HTTP/2 200" ; then
@@ -34,7 +34,7 @@ if ! command -v gsutil &> /dev/null ; then
 fi
 
 
-REPO_NAME=$(repoName "${BUILDKITE_REPO}")
+REPO_NAME=$(repo_name "${BUILDKITE_REPO}")
 BUILD_TAG="buildkite-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_NUMBER}"
 
 REPO_BUILD_TAG="${REPO_NAME}/${BUILD_TAG}"
@@ -76,7 +76,7 @@ google_cloud_auth_publishing() {
     echo "${gsUtilLocation}"
 }
 
-signPackage() {
+sign_package() {
     local package=${1}
     local packageZip=$(basename ${package})
 
@@ -110,7 +110,7 @@ signPackage() {
     rm -r "${gsUtilLocation}"
 }
 
-publishPackage() {
+publish_package() {
     local package=$1
     local packageZip=$(basename ${package})
 
@@ -154,14 +154,14 @@ ls -l "${BUILD_PACKAGES_PATH}"
 for package in $(ls ${BUILD_PACKAGES_PATH}/*.zip); do
     echo "isAlreadyInstalled ${package}?"
     packageZip=$(basename ${package})
-    if isAlreadyPublished ${packageZip} ; then
+    if is_already_published ${packageZip} ; then
         echo "Skipping. ${packageZip} already published"
         continue
     fi
 
     echo "Signing package ${packageZip}"
-    signPackage "${package}"
+    sign_package "${package}"
 
     echo "Publishing package ${packageZip}"
-    publishPackage "${package}"
+    publish_package "${package}"
 done

.buildkite/scripts/tooling.sh

@@ -1,14 +1,22 @@
 #!/bin/bash
 set -euo pipefail
 
-repoName() {
+repo_name() {
     # Example of URL: [email protected]:acme-inc/my-project.git
     local repoUrl=$1
 
     orgAndRepo=$(echo $repoUrl | cut -d':' -f 2)
     echo "$(basename ${orgAndRepo} .git)"
 }
 
+buildkite_pr_branch_build_id() {
+    if [ "${BUILDKITE_PULL_REQUEST}" == "false" ]; then
+        echo "${BUILDKITE_BRANCH}-${BUILDKITE_BUILD_NUMBER}"
+        return
+    fi
+    echo "PR-${BUILDKITE_PULL_REQUEST}-${BUILDKITE_BUILD_NUMBER}"
+}
+
 google_cloud_auth() {
     local keyFile=$1