Skip to content

Commit eb20fc5

Browse files
authored
Fix CI (#426)
* pin docker image version * switch to jdk * update jdk image * bump java version for cloud functions
1 parent ee8c192 commit eb20fc5

8 files changed

Lines changed: 9 additions & 9 deletions

cloudbuild-e2e-cloud-functions-gen2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ steps:
3939
args:
4040
- cloud-functions-gen2
4141
- --functionsource=/workspace/e2e-test-server/build/libs/function-source.zip
42-
- --runtime=java11
42+
- --runtime=java17
4343
- --entrypoint=com.google.cloud.opentelemetry.endtoend.CloudFunctionHandler
4444

4545
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs

cloudbuild-e2e-cloud-run.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
steps:
1515
# Wait for the image to exist
16-
- name: "docker"
16+
- name: docker:28
1717
id: wait-for-image
1818
entrypoint: "sh"
1919
timeout: 3m

cloudbuild-e2e-gae.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
steps:
1515
# Wait for the image to exist
16-
- name: "docker"
16+
- name: docker:28
1717
id: wait-for-image
1818
entrypoint: "sh"
1919
timeout: 3m

cloudbuild-e2e-gce.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
steps:
1515
# Wait for the image to exist
16-
- name: "docker"
16+
- name: docker:28
1717
id: wait-for-image
1818
entrypoint: "sh"
1919
timeout: 3m

cloudbuild-e2e-gke.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
steps:
1515
# Wait for the image to exist
16-
- name: "docker"
16+
- name: docker:28
1717
id: wait-for-image
1818
entrypoint: "sh"
1919
timeout: 3m

cloudbuild-e2e-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
steps:
15-
- name: docker
15+
- name: docker:28
1616
entrypoint: "sh"
1717
args:
1818
- -c

cloudbuild-e2e-local.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
# limitations under the License.
1414
steps:
1515
# Wait for the image to exist
16-
- name: "docker"
16+
- name: docker:28
1717
id: wait-for-image
1818
entrypoint: "sh"
1919
timeout: 3m
2020
env: ["_TEST_SERVER_IMAGE=${_TEST_SERVER_IMAGE}"]
2121
args:
2222
- e2e-test-server/wait-for-image.sh
2323

24-
- name: "docker"
24+
- name: docker:28
2525
id: pull-image
2626
args:
2727
- pull

e2e.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ COPY --chown=gradle:gradle . /app/src
1919
WORKDIR /app/src
2020
RUN gradle :e2e-test-server:build
2121

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

0 commit comments

Comments
 (0)