Compare commits
2 Commits
6497efa435
...
798aa33df1
| Author | SHA1 | Date |
|---|---|---|
|
|
798aa33df1 | |
|
|
08f0a74771 |
|
|
@ -33,11 +33,11 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
if: github.event_name == 'pull_request' || (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
|
||||
steps:
|
||||
- uses: DeterminateSystems/nix-installer-action@e50d5f73bfe71c2dd0aa4218de8f4afa59f8f81d # v16
|
||||
- uses: DeterminateSystems/nix-installer-action@786fff0690178f1234e4e1fe9b536e94f5433196 # v20
|
||||
with:
|
||||
diagnostic-endpoint: ""
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Check for changes
|
||||
run: |
|
||||
|
|
@ -65,11 +65,11 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
if: github.event_name == 'pull_request' || (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
|
||||
steps:
|
||||
- uses: DeterminateSystems/nix-installer-action@e50d5f73bfe71c2dd0aa4218de8f4afa59f8f81d # v16
|
||||
- uses: DeterminateSystems/nix-installer-action@786fff0690178f1234e4e1fe9b536e94f5433196 # v20
|
||||
with:
|
||||
diagnostic-endpoint: ""
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
- name: nix checks
|
||||
run: nix flake check
|
||||
- name: nix build
|
||||
|
|
@ -81,7 +81,7 @@ jobs:
|
|||
id: pages
|
||||
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
|
||||
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v3
|
||||
with:
|
||||
path: ./result
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Set up env vars
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
|
||||
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v9
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
operations-per-run: 200
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ jobs:
|
|||
test-file: ["1-deploy", "2-deploy-with-more-options", "3-deploy-with-webhook"]
|
||||
steps:
|
||||
- name: Check out code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Set up env vars
|
||||
run: |
|
||||
|
|
@ -41,7 +41,7 @@ jobs:
|
|||
echo "GOPATH=/home/runner/go" >> $GITHUB_ENV
|
||||
|
||||
- name: Prepare go environment
|
||||
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
|
||||
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v5
|
||||
with:
|
||||
go-version: ${{ env.GO_VERSION }}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ jobs:
|
|||
outputs:
|
||||
matrix: ${{ steps.matrix.outputs.matrix }}
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
- id: matrix
|
||||
run: |
|
||||
script=$(./test/make_matrix_ginkgo.sh e2e)
|
||||
|
|
@ -37,7 +37,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
needs: [create-e2e-list]
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Set up env vars
|
||||
run: |
|
||||
|
|
@ -46,7 +46,7 @@ jobs:
|
|||
echo "GOPATH=/home/runner/go" >> $GITHUB_ENV
|
||||
|
||||
- name: Prepare go environment
|
||||
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
|
||||
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v5
|
||||
with:
|
||||
go-version: ${{ env.GO_VERSION }}
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ jobs:
|
|||
matrix: ${{ fromJSON(needs.create-e2e-list.outputs.matrix) }}
|
||||
steps:
|
||||
- name: Check out code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Set up env vars
|
||||
run: |
|
||||
|
|
@ -76,7 +76,7 @@ jobs:
|
|||
echo "GOPATH=/home/runner/go" >> $GITHUB_ENV
|
||||
|
||||
- name: Prepare go environment
|
||||
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
|
||||
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v5
|
||||
with:
|
||||
go-version: ${{ env.GO_VERSION }}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ jobs:
|
|||
outputs:
|
||||
matrix: ${{ steps.matrix.outputs.matrix }}
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
- id: matrix
|
||||
run: |
|
||||
script=$(./test/make_matrix_ginkgo.sh helm)
|
||||
|
|
@ -37,7 +37,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
needs: [create-helm-list]
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Set up env vars
|
||||
run: |
|
||||
|
|
@ -46,7 +46,7 @@ jobs:
|
|||
echo "GOPATH=/home/runner/go" >> $GITHUB_ENV
|
||||
|
||||
- name: Prepare go environment
|
||||
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
|
||||
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v5
|
||||
with:
|
||||
go-version: ${{ env.GO_VERSION }}
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ jobs:
|
|||
matrix: ${{ fromJSON(needs.create-helm-list.outputs.matrix) }}
|
||||
steps:
|
||||
- name: Check out code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Set up env vars
|
||||
run: |
|
||||
|
|
@ -77,7 +77,7 @@ jobs:
|
|||
echo "GOPATH=/home/runner/go" >> $GITHUB_ENV
|
||||
|
||||
- name: Prepare go environment
|
||||
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
|
||||
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v5
|
||||
with:
|
||||
go-version: ${{ env.GO_VERSION }}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Check envs
|
||||
run: make -C backup/pvc check-env
|
||||
|
|
@ -46,7 +46,7 @@ jobs:
|
|||
|
||||
- name: Login to Quay.io
|
||||
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
|
||||
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
|
||||
with:
|
||||
registry: quay.io
|
||||
username: ${{ secrets.QUAYIO_USERNAME }}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Deploy Helm chart
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Prep - check out code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
|
||||
- name: Prep - Set up env vars
|
||||
run: |
|
||||
|
|
@ -34,7 +34,7 @@ jobs:
|
|||
file-path: "${{ github.workspace }}/.bats/bats-file"
|
||||
|
||||
- name: Prep - go environment
|
||||
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
|
||||
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v5
|
||||
with:
|
||||
go-version: ${{ env.GO_VERSION }}
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ jobs:
|
|||
run: make bats-tests
|
||||
|
||||
- name: Post - Login to Quay.io
|
||||
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
|
||||
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
|
||||
with:
|
||||
registry: quay.io
|
||||
username: ${{ secrets.QUAYIO_USERNAME }}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ jobs:
|
|||
echo "GOPATH=/home/runner/go" >> $GITHUB_ENV
|
||||
|
||||
- name: Prepare go environment
|
||||
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
|
||||
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v5
|
||||
with:
|
||||
go-version: ${{ env.GO_VERSION }}
|
||||
|
||||
|
|
@ -40,12 +40,12 @@ jobs:
|
|||
echo "VERSION=$(cat VERSION.txt)" >> $GITHUB_ENV
|
||||
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
|
||||
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2
|
||||
with:
|
||||
tag_name: ${{ env.VERSION }}
|
||||
|
||||
- name: Login to Quay.io
|
||||
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
|
||||
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
|
||||
with:
|
||||
registry: quay.io
|
||||
username: ${{ secrets.QUAYIO_USERNAME }}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ jenkins:
|
|||
# image is the name (and tag) of the Jenkins instance
|
||||
# Default: jenkins/jenkins:lts
|
||||
# It's recommended to use LTS (tag: "lts") version
|
||||
image: jenkins/jenkins:2.516.3-lts
|
||||
image: jenkins/jenkins:2.528.1-lts
|
||||
|
||||
# env contains jenkins container environment variables
|
||||
env: []
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ GO_VERSION="1.22"
|
|||
HELM_VERSION="3.12.3"
|
||||
IMAGE_PULL_MODE="local"
|
||||
KIND_CLUSTER_NAME="jenkins"
|
||||
LATEST_LTS_VERSION="2.516.3"
|
||||
LATEST_LTS_VERSION="2.528.1"
|
||||
NAME="kubernetes-operator"
|
||||
NAMESPACE="default"
|
||||
OPERATOR_SDK_VERSION="1.35.0"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ const (
|
|||
// SeedJobSuffix is a suffix added for all seed jobs
|
||||
SeedJobSuffix = "job-dsl-seed"
|
||||
// DefaultJenkinsMasterImage is the default Jenkins master docker image
|
||||
DefaultJenkinsMasterImage = "jenkins/jenkins:2.516.3-lts"
|
||||
DefaultJenkinsMasterImage = "jenkins/jenkins:2.528.1-lts"
|
||||
// DefaultHTTPPortInt32 is the default Jenkins HTTP port
|
||||
DefaultHTTPPortInt32 = int32(8080)
|
||||
// DefaultSlavePortInt32 is the default Jenkins port for slaves
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package plugins
|
||||
|
||||
const (
|
||||
configurationAsCodePlugin = "configuration-as-code:1998.v3e50e6e9d9d3"
|
||||
gitPlugin = "git:5.7.0"
|
||||
configurationAsCodePlugin = "configuration-as-code:2006.v001a_2ca_6b_574"
|
||||
gitPlugin = "git:5.8.0"
|
||||
jobDslPlugin = "job-dsl:1.93"
|
||||
kubernetesPlugin = "kubernetes:4384.v1b_6367f393d9"
|
||||
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ diag() {
|
|||
--set namespace=${DETIK_CLIENT_NAMESPACE} \
|
||||
--set operator.image=${OPERATOR_IMAGE} \
|
||||
--set jenkins.latestPlugins=true \
|
||||
--set jenkins.image="jenkins/jenkins:2.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=false \
|
||||
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
|
||||
|
|
@ -158,7 +158,7 @@ diag() {
|
|||
--set namespace=${DETIK_CLIENT_NAMESPACE} \
|
||||
--set operator.image=${OPERATOR_IMAGE} \
|
||||
--set jenkins.latestPlugins=true \
|
||||
--set jenkins.image="jenkins/jenkins:2.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=false \
|
||||
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ setup() {
|
|||
--set operator.image=${OPERATOR_IMAGE} \
|
||||
--set jenkins.latestPlugins=true \
|
||||
--set jenkins.nodeSelector.batstest=yep \
|
||||
--set jenkins.image="jenkins/jenkins:2.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=false \
|
||||
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
|
||||
|
|
@ -107,7 +107,7 @@ setup() {
|
|||
--set operator.image=${OPERATOR_IMAGE} \
|
||||
--set jenkins.latestPlugins=true \
|
||||
--set jenkins.nodeSelector.batstest=yep \
|
||||
--set jenkins.image="jenkins/jenkins:2.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=false \
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ setup() {
|
|||
--set namespace=${DETIK_CLIENT_NAMESPACE} \
|
||||
--set operator.image=${OPERATOR_IMAGE} \
|
||||
--set jenkins.latestPlugins=true \
|
||||
--set jenkins.image="jenkins/jenkins:2.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=true \
|
||||
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
|
||||
|
|
@ -90,7 +90,7 @@ setup() {
|
|||
--set namespace=${DETIK_CLIENT_NAMESPACE} \
|
||||
--set operator.image=${OPERATOR_IMAGE} \
|
||||
--set jenkins.latestPlugins=true \
|
||||
--set jenkins.image="jenkins/jenkins:2.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=true \
|
||||
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ const e2e = "e2e"
|
|||
// Plugin versions should be the same as in
|
||||
// github.com/jenkinsci/kubernetes-operator/pkg/plugins/base_plugins.go
|
||||
const (
|
||||
configurationAsCodePlugin = "configuration-as-code:1998.v3e50e6e9d9d3"
|
||||
gitPlugin = "git:5.7.0"
|
||||
configurationAsCodePlugin = "configuration-as-code:2006.v001a_2ca_6b_574"
|
||||
gitPlugin = "git:5.8.0"
|
||||
jobDslPlugin = "job-dsl:1.93"
|
||||
kubernetesPlugin = "kubernetes:4384.v1b_6367f393d9"
|
||||
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/envtest"
|
||||
)
|
||||
|
||||
const JenkinsTestImage = "jenkins/jenkins:2.516.3-lts"
|
||||
const JenkinsTestImage = "jenkins/jenkins:2.528.1-lts"
|
||||
|
||||
var (
|
||||
Cfg *rest.Config
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() {
|
|||
|
||||
cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug",
|
||||
"--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name),
|
||||
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.516.3-lts"),
|
||||
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.528.1-lts"),
|
||||
"--set-string", fmt.Sprintf("operator.image=%s", *imageName),
|
||||
"--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"),
|
||||
"--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install")
|
||||
|
|
|
|||
Loading…
Reference in New Issue