Skip to content

Fix CI #426

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

Merged
dashpole merged 4 commits into from
Dec 4, 2025
Merged

Fix CI #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ceeec46
pin docker image version
dashpole Dec 4, 2025
6c825e6
switch to jdk
dashpole Dec 4, 2025
bbf8550
update jdk image
dashpole Dec 4, 2025
dbf0737
bump java version for cloud functions
dashpole Dec 4, 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
2 changes: 1 addition & 1 deletion cloudbuild-e2e-cloud-functions-gen2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ steps:
args:
- cloud-functions-gen2
- --functionsource=/workspace/e2e-test-server/build/libs/function-source.zip
- --runtime=java11
- --runtime=java17
- --entrypoint=com.google.cloud.opentelemetry.endtoend.CloudFunctionHandler

logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild-e2e-cloud-run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
steps:
# Wait for the image to exist
- name: "docker"
- name: docker:28
id: wait-for-image
entrypoint: "sh"
timeout: 3m
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild-e2e-gae.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
steps:
# Wait for the image to exist
- name: "docker"
- name: docker:28
id: wait-for-image
entrypoint: "sh"
timeout: 3m
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild-e2e-gce.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
steps:
# Wait for the image to exist
- name: "docker"
- name: docker:28
id: wait-for-image
entrypoint: "sh"
timeout: 3m
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild-e2e-gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
steps:
# Wait for the image to exist
- name: "docker"
- name: docker:28
id: wait-for-image
entrypoint: "sh"
timeout: 3m
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild-e2e-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
steps:
- name: docker
- name: docker:28
entrypoint: "sh"
args:
- -c
Expand Down
4 changes: 2 additions & 2 deletions cloudbuild-e2e-local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
# limitations under the License.
steps:
# Wait for the image to exist
- name: "docker"
- name: docker:28
id: wait-for-image
entrypoint: "sh"
timeout: 3m
env: ["_TEST_SERVER_IMAGE=${_TEST_SERVER_IMAGE}"]
args:
- e2e-test-server/wait-for-image.sh

- name: "docker"
- name: docker:28
id: pull-image
args:
- pull
Expand Down
2 changes: 1 addition & 1 deletion e2e.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COPY --chown=gradle:gradle . /app/src
WORKDIR /app/src
RUN gradle :e2e-test-server:build

FROM openjdk:11-jre-slim
FROM openjdk:26-ea-11-jdk-slim
COPY --from=builder /app/src/e2e-test-server/build/libs/*-all.jar /app/app.jar
WORKDIR /app
CMD java -jar app.jar
Loading