Skip to content

Commit

Permalink
Merge branch 'master' into multiplatforms
Browse files Browse the repository at this point in the history
  • Loading branch information
smerle33 authored Aug 10, 2023
2 parents 8cd3392 + 1e6d502 commit 860eda8
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/updatecli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v3
- name: Install updatecli CLI
env:
UPDATECLI_VERSION: v0.55.2
UPDATECLI_VERSION: v0.56.0
run: |
curl --silent --location --show-error --output /tmp/updatecli.tgz \
"https://github.com/updatecli/updatecli/releases/download/${UPDATECLI_VERSION}/updatecli_$(uname -s)_$(uname -m).tar.gz"
Expand Down
7 changes: 6 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,9 @@ buildDockerImage_k8s('plugins-site-api')
* (Open)JDK v8
* Maven 3.6.x

===
=== Testing a pull request

By adding `@Library('pipeline-library@pull/<your-pr-number>/head') _` at the top of a Jenkinsfile from a repository built on one of the *.ci.jenkins.io instances, you can test your pipeline library pull request on ci.jenkins.io.

A repository is dedicated for these kind of tests: https://github.com/jenkinsci/jenkins-infra-test-plugin/

2 changes: 1 addition & 1 deletion vars/terraform.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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:0.5.198', // Version managed by updatecli
agentContainerImage: 'jenkinsciinfra/hashicorp-tools:0.6.1', // 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)
]
Expand Down
2 changes: 1 addition & 1 deletion vars/updatecli.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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:2.6.12', // Container image to use for running updatecli
updatecliDockerImage: 'jenkinsciinfra/helmfile:2.6.14', // 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
Expand Down
2 changes: 1 addition & 1 deletion vars/updatecli.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<li>String action: (Optional - Default: "diff") Updatecli action (e.g. subcommand) to execute.</li>
<li>String config: (Optional - Default: "./updatecli/updatecli.d") path to the file or directory with the updatecli configuration (flag "--config").</li>
<li>String values: (Optional - Default: "./updatecli/values.yaml") path to the file with the updatecli values (flag "--values").</li>
<li>String updatecliDockerImage: (Optional - Default: "jenkinsciinfra/helmfile:2.6.12") Docker Image of updatecli to be used in the process.</li>
<li>String updatecliDockerImage: (Optional - Default: "jenkinsciinfra/helmfile:2.6.14") Docker Image of updatecli to be used in the process.</li>
<li>String cronTriggerExpression: (Optional - Default: "") Enable periodic execution by providing a cron-like expression.</li>
<li>String containerMemory: (Optional - Default: "512Mi") specify the amount of memory dedicated to the updatecli container.</li>
<li>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</li>
Expand Down

0 comments on commit 860eda8

Please sign in to comment.