Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8s - Jenkins - Add annotations #2850

Merged
merged 10 commits into from
Jan 30, 2025
+3 −2
Merged

K8s - Jenkins - Add annotations #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc7ce1e
K8s - Gitlab - Add annotations
armandomiani Jan 13, 2025
3f54778
K8s - Jenkins - Add annotations
armandomiani Jan 13, 2025
b88a31c
Merge branch 'master' into miani-k8s-jenkins-20250113
armandomiani Jan 17, 2025
d942cdf
Merge branch 'master' into miani-k8s-jenkins-20250113
armandomiani Jan 27, 2025
1cb2d45
Merge branch 'miani-k8s-jenkins-20250113' of github.com:GoogleCloudPl…
armandomiani Jan 27, 2025
12fedcf
Merge branch 'miani-k8s-gitlab-20250113' of github.com:GoogleCloudPla…
armandomiani Jan 28, 2025
4f4c197
fix: add ca-certificates
armandomiani Jan 28, 2025
0ec25b3
Merge branch 'master' of github.com:GoogleCloudPlatform/click-to-deploy
armandomiani Jan 29, 2025
d74aaea
Merge branch 'master' into miani-k8s-jenkins-20250113
armandomiani Jan 29, 2025
bc52a8f
Merge branch 'master' into miani-k8s-jenkins-20250113
armandomiani Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions k8s/jenkins/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ APP_ID ?= $(CHART_NAME)
VERIFY_WAIT_TIMEOUT = 1800

TRACK ?= 2
SERVICE_NAME := services/db9fe615-e7a9-4387-abe6-4126d6cec552.cloudpartnerservices.goog
METRICS_EXPORTER_TAG ?= v0.5.1

SOURCE_REGISTRY ?= marketplace.gcr.io/google
Expand Down
4 changes: 2 additions & 2 deletions k8s/jenkins/apptest/tester/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.5
FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8

RUN apt-get update && apt-get install -y --no-install-recommends \
curl \
Expand All @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
wget \
&& rm -rf /var/lib/apt/lists/*

RUN wget -q -O /bin/kubectl \
RUN curl -L -o /bin/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubectl \
&& chmod 755 /bin/kubectl

Expand Down