Skip to content

Commit abd07eb

Browse files
committed
use docker image
1 parent dbdfae7 commit abd07eb

File tree

1 file changed

+48
-28
lines changed

1 file changed

+48
-28
lines changed

.cloudbuild/library_generation/cloudbuild-library-generation-integration-test.yaml

+48-28
Original file line numberDiff line numberDiff line change
@@ -63,34 +63,54 @@ steps:
6363
id: prepare-golden
6464
waitFor: ["-"]
6565

66-
- name: ubuntu:24.04
67-
entrypoint: bash
68-
args:
69-
- "-c"
70-
- |
71-
# Install docker
72-
apt update
73-
apt install -y ca-certificates curl gnupg lsb-release
74-
mkdir -p /etc/apt/keyrings
75-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | \
76-
gpg --dearmor -o /etc/apt/keyrings/docker.gpg
77-
echo \
78-
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
79-
$(lsb_release -cs) stable" | \
80-
tee /etc/apt/sources.list.d/docker.list > /dev/null
81-
apt update
82-
apt -y install \
83-
docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
84-
docker run \
85-
--rm \
86-
--quiet \
87-
-u "$(id -u):$(id -g)" \
88-
-v "/workspace/google-cloud-java:/workspace" \
89-
-v "/workspace/hermetic_build/library_generation/tests/resources/integration/google-cloud-java:/workspace/config" \
90-
-v "/workspace/googleapis:/workspace/apis" \
91-
"${_TEST_IMAGE}" \
92-
--generation-config-path="/workspace/config/generation_config.yaml" \
93-
--api-definitions-path="/workspace/apis"
66+
#- name: ubuntu:24.04
67+
# entrypoint: bash
68+
# args:
69+
# - "-c"
70+
# - |
71+
# # Install docker
72+
# apt update
73+
# apt install -y ca-certificates curl gnupg lsb-release
74+
# mkdir -p /etc/apt/keyrings
75+
# curl -fsSL https://download.docker.com/linux/ubuntu/gpg | \
76+
# gpg --dearmor -o /etc/apt/keyrings/docker.gpg
77+
# echo \
78+
# "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
79+
# $(lsb_release -cs) stable" | \
80+
# tee /etc/apt/sources.list.d/docker.list > /dev/null
81+
# apt update
82+
# apt -y install \
83+
# docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
84+
# docker run \
85+
# --rm \
86+
# --quiet \
87+
# -u "$(id -u):$(id -g)" \
88+
# -v "/workspace/google-cloud-java:/workspace" \
89+
# -v "/workspace/hermetic_build/library_generation/tests/resources/integration/google-cloud-java:/workspace/config" \
90+
# -v "/workspace/googleapis:/workspace/apis" \
91+
# "${_TEST_IMAGE}" \
92+
# --generation-config-path="/workspace/config/generation_config.yaml" \
93+
# --api-definitions-path="/workspace/apis"
94+
# id: generate-libraries
95+
# waitFor: [
96+
# "build-image",
97+
# "download-api-definitions",
98+
# "prepare-golden"
99+
# ]
100+
101+
- name: gcr.io/cloud-builders/docker
102+
args: [
103+
"run",
104+
"--rm",
105+
"-v", "/workspace/google-cloud-java:/workspace",
106+
"-v", "/workspace/hermetic_build/library_generation/tests/resources/integration/google-cloud-java:/workspace/config",
107+
"-v", "/workspace/googleapis:/workspace/apis",
108+
"${_TEST_IMAGE}",
109+
"--generation-config-path=/workspace/config/generation_config.yaml",
110+
"--api-definitions-path=/workspace/apis"
111+
]
112+
env:
113+
- "DOCKER_BUILDKIT=1"
94114
id: generate-libraries
95115
waitFor: [
96116
"build-image",

0 commit comments

Comments
 (0)