Merge branch 'main' into updatecli_main_c35657e6787ddc470ba756146a7d2…

…c7483f3ae558cae0a5aae6f9225bb579a11
jenkins-infra · May 13, 2024 · d5333ae · d5333ae
2 parents 4837880 + 25130e4
commit d5333ae
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/goss/goss-common.yaml b/goss/goss-common.yaml
@@ -4,12 +4,12 @@ command:
     exec: aws --version
     exit-status: 0
     stdout:
-      - 2.15.40
+      - 2.15.48
   azurecli:
     exec: az --version
     exit-status: 0
     stdout:
-      - 2.59.0
+      - 2.60.0
   bundle:
     exec: bundle -v
     exit-status: 0
@@ -27,12 +27,12 @@ command:
     exec: docker-compose -v
     exit-status: 0
     stdout:
-      - 2.26.1
+      - 2.27.0
   gh_cli:
     exec: gh --version
     exit-status: 0
     stdout:
-      - 2.48.0
+      - 2.49.1
   git_lfs:
     exec: git-lfs --version
     exit-status: 0
@@ -98,7 +98,7 @@ command:
     exec: updatecli version
     exit-status: 0
     stderr:
-      - 0.75.0
+      - 0.77.0
   yq:
     exec: yq --version
     exit-status: 0

diff --git a/goss/goss-linux.yaml b/goss/goss-linux.yaml
@@ -20,7 +20,7 @@ command:
     exec: docker -v
     exit-status: 0
     stdout:
-      - 26.1.0
+      - 26.1.2
   docker_buildx:
     exec: docker buildx version
     exit-status: 0
@@ -53,7 +53,7 @@ command:
     exec: helmfile --version
     exit-status: 0
     stdout:
-      - 0.163.1
+      - 0.164.0
   helmplugins:
     exec: helm plugin list
     exit-status: 0

diff --git a/main.pkr.hcl b/main.pkr.hcl
@@ -6,7 +6,7 @@ packer {
       source  = "github.com/rgl/windows-update"
     }
     azure = {
-      version = "2.1.2"
+      version = "2.1.3"
       source  = "github.com/hashicorp/azure"
     }
     docker = {

diff --git a/provisioning/get-fileshare-signed-url.sh b/provisioning/get-fileshare-signed-url.sh
@@ -29,6 +29,11 @@ set +x
 
 : "${STORAGE_FILESHARE?}" "${STORAGE_NAME?}" "${STORAGE_DURATION_IN_MINUTE?}" "${STORAGE_PERMISSIONS?}"
 
+# Ensure the script is re-entrant by using unique temporary `az` configuration directory for each call
+# Ref. https://learn.microsoft.com/en-us/cli/azure/use-azure-cli-successfully?tabs=bash%2Cbash2#concurrent-execution
+AZURE_CONFIG_DIR="$(mktemp -d)"
+export AZURE_CONFIG_DIR
+
 accountKeyArg=()
 shouldLogout="true"
 # If a storage account key env var exists, use it instead of a service principal to generate a file share SAS token

diff --git a/provisioning/tools-versions.yml b/provisioning/tools-versions.yml
@@ -1,15 +1,15 @@
 # if manually change, please update the goss file accordingly
 asdf_version: 0.14.0
-awscli_version: 2.15.40
+awscli_version: 2.15.48
 azcopy_version: 10.24.0-20240326
-azurecli_version: 2.59.0
+azurecli_version: 2.60.0
 chocolatey_version: 1.4.0
-compose_version: 2.26.1
+compose_version: 2.27.0
 cst_version: 1.17.0
 default_jdk: 11
-docker_version: 26.1.0
+docker_version: 26.1.2
 doctl_version: 1.101.0
-gh_version: 2.48.0
+gh_version: 2.49.1
 git_lfs_version: 3.5.1
 git_linux_version: 2.43.2
 git_windows_version: 2.44.0
@@ -19,7 +19,7 @@ goss_version: 0.4.6
 hadolint_version: 2.12.0
 helm_version: 3.14.4
 helm_diff_version: 3.9.6
-helmfile_version: 0.163.1
+helmfile_version: 0.164.0
 helm_git_version: 0.16.0
 helm_secrets_version: 4.6.0
 jdk11_version: 11.0.23+9
@@ -43,7 +43,7 @@ ruby_version: 3.3.0
 sops_version: 3.8.1
 terraform_version: 1.6.6
 trivy_version: 0.50.1
-updatecli_version: 0.75.0
+updatecli_version: 0.77.0
 vagrant_version: 2.4.1
 windows_pwsh_version: 7.4.2
 xq_version: 1.2.3