Skip to content

Commit 98b7d85

Browse files
authored
Merge branch 'main' into fix/user-roles-order-sensitive-comparison
2 parents 6d23a02 + 443fbd0 commit 98b7d85

7 files changed

Lines changed: 52 additions & 8 deletions

File tree

.e2eignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ README.md
77
LICENSE
88
operator.png
99
kubernetes.svg
10-
release_versions
10+
e2e-tests/release_versions
1111
.github/**
1212
.e2eignore

.github/ISSUE_TEMPLATE/1-feature-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature request 🧭
22
description: Suggest an idea for this project
3-
labels: "feature-request"
3+
labels: ["feature-request", "Proposed", "PSMDB", "MongoDB"]
44
body:
55
- type: textarea
66
attributes:

.github/workflows/reviewdog.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,43 @@ jobs:
105105
run: |
106106
make generate manifests VERSION=main
107107
git diff --exit-code
108+
109+
e2e-release-versions-images:
110+
name: e2e-tests release_versions image availability
111+
runs-on: ubuntu-latest
112+
steps:
113+
- uses: actions/checkout@v6
114+
with:
115+
fetch-depth: 0
116+
- name: Check if e2e-tests/release_versions changed
117+
id: changed
118+
run: |
119+
git fetch origin ${{ github.base_ref }}
120+
if git diff --name-only origin/${{ github.base_ref }}...HEAD -- e2e-tests/release_versions | grep -q .; then
121+
echo "changed=true" >> "$GITHUB_OUTPUT"
122+
else
123+
echo "changed=false" >> "$GITHUB_OUTPUT"
124+
fi
125+
- name: Verify release_versions images exist (docker manifest inspect)
126+
if: steps.changed.outputs.changed == 'true'
127+
run: |
128+
set -e
129+
# All IMAGE_*=value lines, exclude operator image (percona/percona-server-mongodb-operator)
130+
images=$(grep -E '^IMAGE_[^=]+=' e2e-tests/release_versions | cut -d= -f2 | grep -v '^$' | grep -v 'percona/percona-server-mongodb-operator' | sort -u)
131+
if [ -z "$images" ]; then
132+
echo "No non-operator images found in e2e-tests/release_versions"
133+
exit 0
134+
fi
135+
failed=""
136+
for img in $images; do
137+
echo "Checking image $img"
138+
if ! docker manifest inspect "$img"; then
139+
echo "::error::Image not found or inaccessible: $img"
140+
failed="${failed} ${img}"
141+
fi
142+
done
143+
if [ -n "$failed" ]; then
144+
echo "::error::The following images failed docker manifest inspect:$failed"
145+
exit 1
146+
fi
147+
echo "All images are available."

Jenkinsfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,13 +394,16 @@ void checkE2EIgnoreFiles() {
394394
echo "Excluded files: $excludedFiles"
395395
echo "Changed files: $changedFiles"
396396

397-
def excludedFilesRegex = excludedFiles.collect{it.replace("**", ".*").replace("*", "[^/]*")}
397+
// Use placeholder so the * in ".*" (from **) is not replaced by [^/]*
398+
def excludedFilesRegex = excludedFiles.collect{
399+
it.replace("**", ".__STARSTAR__").replace("*", "[^/]*").replace(".__STARSTAR__", ".*")
400+
}
398401
needToRunTests = !changedFiles.every{changed -> excludedFilesRegex.any{regex -> changed ==~ regex}}
399402

400403
if (needToRunTests) {
401404
echo "Some changed files are outside of the e2eignore list. Proceeding with execution."
402405
} else {
403-
if (currentBuild.previousBuild?.result != 'SUCCESS') {
406+
if (currentBuild.previousBuild?.result != 'SUCCESS' && currentBuild.number != 1) {
404407
echo "All changed files are e2eignore files, and previous build was unsuccessful. Propagating previous state."
405408
currentBuild.result = currentBuild.previousBuild?.result
406409
error "Skipping execution as non-significant changes detected and previous build was unsuccessful."

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ IMAGE ?= $(IMAGE_TAG_BASE):$(VERSION)
77
DEPLOYDIR = ./deploy
88

99
ENVTEST_K8S_VERSION = 1.31
10+
ENVTEST_VERSION ?= release-0.23
1011

1112
all: build
1213

@@ -94,7 +95,7 @@ kustomize: ## Download kustomize locally if necessary.
9495

9596
ENVTEST = $(shell pwd)/bin/setup-envtest
9697
envtest: ## Download envtest-setup locally if necessary.
97-
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
98+
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION))
9899

99100
SWAGGER = $(shell pwd)/bin/swagger
100101
swagger: ## Download swagger locally if necessary.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ require (
100100
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
101101
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
102102
github.com/go-ini/ini v1.67.0 // indirect
103-
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
103+
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
104104
github.com/go-ldap/ldap/v3 v3.4.12 // indirect
105105
github.com/go-logr/stdr v1.2.2 // indirect
106106
github.com/go-logr/zapr v1.3.0 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ
183183
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
184184
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
185185
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
186-
github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
187-
github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
186+
github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
187+
github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
188188
github.com/go-ldap/ldap/v3 v3.4.12 h1:1b81mv7MagXZ7+1r7cLTWmyuTqVqdwbtJSjC0DAp9s4=
189189
github.com/go-ldap/ldap/v3 v3.4.12/go.mod h1:+SPAGcTtOfmGsCb3h1RFiq4xpp4N636G75OEace8lNo=
190190
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

0 commit comments

Comments
 (0)