Jenkins cleanup: Part 1 (#337)

Author: oakrizan

.buildkite/hooks/pre-command

@@ -26,3 +26,10 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "golang-crossbuild" && "$BUILDKITE_STEP_KEY"
     export GITHUB_USERNAME_SECRET=$(retry 5 vault kv get -field username ${GITHUB_TOKEN_VAULT_PATH})
     export GITHUB_EMAIL_SECRET=$(retry 5 vault kv get -field email ${GITHUB_TOKEN_VAULT_PATH})
 fi
+
+if [[ "$BUILDKITE_PIPELINE_SLUG" == "llvm-apple" && ("$BUILDKITE_STEP_KEY" =~ ^build)]]; then
+#    export PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(retry 5 vault kv get -field plaintext ${PRIVATE_CI_GCS_CREDENTIALS_PATH})
+    export DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field user "${DOCKER_REGISTRY_SECRET_PATH}")
+    export DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
+    docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY}" 2>/dev/null
+fi

.buildkite/hooks/pre-exit

@@ -14,5 +14,13 @@ if [[ ( "$BUILDKITE_PIPELINE_SLUG" == "golang-crossbuild" || "$BUILDKITE_PIPELIN
     docker logout "${DOCKER_REGISTRY}"
 fi
 
+#if [[ "$BUILDKITE_PIPELINE_SLUG" == "llvm-apple" && "$BUILDKITE_STEP_KEY" =~ ^build ]]; then
+#    google_cloud_logout_active_account
+#fi
+#
+#if [[ "$BUILDKITE_PIPELINE_SLUG" == "llvm-apple" && ("$BUILDKITE_STEP_KEY" =~ ^build || "$BUILDKITE_STEP_KEY" =~ ^publish) ]]; then
+#    docker logout "${DOCKER_REGISTRY}"
+#fi
+
 # Ensure that any temporal files created during any step are removed
 cleanup

.ci/jobs/folders.yml

@@ -1,24 +1,13 @@
 queue_rules:
   - name: default
     conditions:
-      - check-success=beats-ci/pr-merge
+      - check-success=buildkite/golang-crossbuild
       - check-success=CLA
 pull_request_rules:
-  - name: delete upstream branch after merging changes on Jenkinsfile or it's closed
-    conditions:
-      - or:
-        - merged
-        - closed
-      - and:
-        - label=automation
-        - head~=^updatecli
-        - files~=^Jenkinsfile$
-    actions:
-      delete_head_branch:
   - name: automatic approval for automated pull requests with golang bump updates
     conditions:
       - author=apmmachine
-      - check-success=beats-ci/pr-merge
+      - check-success=buildkite/golang-crossbuild
       - label=automation
       - files~=^go/Makefile.common
     actions: