From 65187324ae8f372b2ef9ae190fc32ed39b7246a4 Mon Sep 17 00:00:00 2001 From: "updatecli-gha-in-jenkins-infra-org[bot]" <83065101+updatecli-gha-in-jenkins-infra-org[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 08:07:02 +0100 Subject: [PATCH 1/4] Bump `hashicorp-tools` docker image to 1.0.59 (#819) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chore: Update Terraform file in groovy code Made with ❤️️ by updatecli Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com> --- vars/terraform.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/terraform.groovy b/vars/terraform.groovy index cc976369..6f98402d 100644 --- a/vars/terraform.groovy +++ b/vars/terraform.groovy @@ -9,7 +9,7 @@ def call(userConfig = [:]) { stagingCredentials: [], // No custom secrets for staging by default productionCredentials: [], // No custom secrets for production by default productionBranch: 'main', // Defaults to the principal branch - agentContainerImage: 'jenkinsciinfra/hashicorp-tools:1.0.57', // Version managed by updatecli + agentContainerImage: 'jenkinsciinfra/hashicorp-tools:1.0.59', // Version managed by updatecli runTests: false, // Executes the tests provided by the "calling" project, which should provide a tests/Makefile runCommonTests: true, // Executes the default test suite from the shared tools repository (terratest) ] From 9b82abda396548a6088c60157025060940e58ce3 Mon Sep 17 00:00:00 2001 From: "updatecli-gha-in-jenkins-infra-org[bot]" <83065101+updatecli-gha-in-jenkins-infra-org[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 07:11:07 +0000 Subject: [PATCH 2/4] Bump `docker-helmfile` version to 3.0.58 (#818) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-helmfile in documentation Made with ❤️️ by updatecli * chore: Update docker-helmfile in groovy code Made with ❤️️ by updatecli --------- Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com> Co-authored-by: Damien Duportal --- vars/updatecli.groovy | 2 +- vars/updatecli.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/updatecli.groovy b/vars/updatecli.groovy index 918114f2..f8f344b7 100644 --- a/vars/updatecli.groovy +++ b/vars/updatecli.groovy @@ -7,7 +7,7 @@ def call(userConfig = [:]) { action: 'diff', // Updatecli subcommand to execute config: './updatecli/updatecli.d', // Config manifest used by updatecli (can be a file or a directory) values: './updatecli/values.yaml', // Values file used by updatecli - updatecliDockerImage: 'jenkinsciinfra/helmfile:3.0.57', // Container image to use for running updatecli + updatecliDockerImage: 'jenkinsciinfra/helmfile:3.0.58', // Container image to use for running updatecli containerMemory: '512Mi', // When using 'updatecliDockerImage', this is the memory limit+request of the container cronTriggerExpression: '', // When specified, it enables cron trigger for the calling pipeline credentialsId: 'github-app-updatecli-on-jenkins-infra', // githubApp or usernamePassword credentials id to use to get an Access Token. The corresponding populated env vars are USERNAME_VALUE & UPDATECLI_GITHUB_TOKEN diff --git a/vars/updatecli.txt b/vars/updatecli.txt index 6606cc4d..6056c77c 100644 --- a/vars/updatecli.txt +++ b/vars/updatecli.txt @@ -8,7 +8,7 @@
  • String action: (Optional - Default: "diff") Updatecli action (e.g. subcommand) to execute.
  • String config: (Optional - Default: "./updatecli/updatecli.d") path to the file or directory with the updatecli configuration (flag "--config").
  • String values: (Optional - Default: "./updatecli/values.yaml") path to the file with the updatecli values (flag "--values").
    • -
  • String updatecliDockerImage: (Optional - Default: "jenkinsciinfra/helmfile:3.0.57") Docker Image of updatecli to be used in the process.
    • +
  • String updatecliDockerImage: (Optional - Default: "jenkinsciinfra/helmfile:3.0.58") Docker Image of updatecli to be used in the process.
  • String cronTriggerExpression: (Optional - Default: "") Enable periodic execution by providing a cron-like expression.
  • String containerMemory: (Optional - Default: "512Mi") specify the amount of memory dedicated to the updatecli container.
  • String credentialsId: (Optional - Default: "github-app-updatecli-on-jenkins-infra") specify the githubApp or usernamePassword credentials id to use to get an Access Token. The corresponding populated env vars are USERNAME_VALUE & UPDATECLI_GITHUB_TOKEN
    • From ef42c6c74c5e0c12a7f804b5e9590ff7135ccaba Mon Sep 17 00:00:00 2001 From: "updatecli-gha-in-jenkins-infra-org[bot]" <83065101+updatecli-gha-in-jenkins-infra-org[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 09:16:47 +0100 Subject: [PATCH 3/4] Bump `hashicorp-tools` docker image to 1.0.60 (#820) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chore: Update Terraform file in groovy code Made with ❤️️ by updatecli Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com> --- vars/terraform.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/terraform.groovy b/vars/terraform.groovy index 6f98402d..118a748e 100644 --- a/vars/terraform.groovy +++ b/vars/terraform.groovy @@ -9,7 +9,7 @@ def call(userConfig = [:]) { stagingCredentials: [], // No custom secrets for staging by default productionCredentials: [], // No custom secrets for production by default productionBranch: 'main', // Defaults to the principal branch - agentContainerImage: 'jenkinsciinfra/hashicorp-tools:1.0.59', // Version managed by updatecli + agentContainerImage: 'jenkinsciinfra/hashicorp-tools:1.0.60', // Version managed by updatecli runTests: false, // Executes the tests provided by the "calling" project, which should provide a tests/Makefile runCommonTests: true, // Executes the default test suite from the shared tools repository (terratest) ] From 4b8165af619d813c34b9d61b4bcc3f674f3af396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Tue, 9 Jan 2024 00:30:08 +0100 Subject: [PATCH 4/4] chore: show `--print` output when using docker bake to publish an image (#821) --- resources/io/jenkins/infra/docker/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/io/jenkins/infra/docker/Makefile b/resources/io/jenkins/infra/docker/Makefile index a39b8660..20e64e9a 100644 --- a/resources/io/jenkins/infra/docker/Makefile +++ b/resources/io/jenkins/infra/docker/Makefile @@ -76,6 +76,7 @@ build: ## Build the Docker Image $(IMAGE_NAME) from $(IMAGE_DOCKERFILE) bake-build: ## Build the Docker Image(s) with dockerbake file @echo "== Building from DockerBake file $(DOCKER_BAKE_FILE)" + @docker buildx bake -f "$(DOCKER_BAKE_FILE)" --print @docker buildx bake -f "$(DOCKER_BAKE_FILE)" @echo "== Build succeeded"