Skip to content

Commit 5770e42

Browse files
rafaelwestphalrafaelwestphal
authored
Adding plugin .tar file to artifact. (#1877)
1 parent 1fba16f commit 5770e42

File tree

4 files changed

+16
-45
lines changed

4 files changed

+16
-45
lines changed

‎Dockerfile

+10-40
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ COPY --from=centos8-build-diagnostics /work/cache /work/cache
173173
COPY --from=centos8-build-wrapper /work/cache /work/cache
174174
RUN ./pkg/rpm/build.sh
175175

176-
177-
FROM centos8-build AS centos8-build-plugin
178-
WORKDIR /work
179176
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
180177
COPY ./builds/ops_agent_plugin.sh .
181178
RUN ./ops_agent_plugin.sh /work/cache/
@@ -185,7 +182,7 @@ RUN ./pkg/plugin/build.sh /work/cache centos8
185182
FROM scratch AS centos8
186183
COPY --from=centos8-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-centos-8.tgz
187184
COPY --from=centos8-build /google-cloud-ops-agent*.rpm /
188-
COPY --from=centos8-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
185+
COPY --from=centos8-build /google-cloud-ops-agent-plugin*.tar.gz /
189186

190187
# ======================================
191188
# Build Ops Agent for rockylinux-9
@@ -289,9 +286,6 @@ COPY --from=rockylinux9-build-diagnostics /work/cache /work/cache
289286
COPY --from=rockylinux9-build-wrapper /work/cache /work/cache
290287
RUN ./pkg/rpm/build.sh
291288

292-
293-
FROM rockylinux9-build AS rockylinux9-build-plugin
294-
WORKDIR /work
295289
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
296290
COPY ./builds/ops_agent_plugin.sh .
297291
RUN ./ops_agent_plugin.sh /work/cache/
@@ -301,7 +295,7 @@ RUN ./pkg/plugin/build.sh /work/cache rockylinux9
301295
FROM scratch AS rockylinux9
302296
COPY --from=rockylinux9-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-rockylinux-9.tgz
303297
COPY --from=rockylinux9-build /google-cloud-ops-agent*.rpm /
304-
COPY --from=rockylinux9-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
298+
COPY --from=rockylinux9-build /google-cloud-ops-agent-plugin*.tar.gz /
305299

306300
# ======================================
307301
# Build Ops Agent for debian-bookworm
@@ -400,9 +394,6 @@ COPY --from=bookworm-build-diagnostics /work/cache /work/cache
400394
COPY --from=bookworm-build-wrapper /work/cache /work/cache
401395
RUN ./pkg/deb/build.sh
402396

403-
404-
FROM bookworm-build AS bookworm-build-plugin
405-
WORKDIR /work
406397
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
407398
COPY ./builds/ops_agent_plugin.sh .
408399
RUN ./ops_agent_plugin.sh /work/cache/
@@ -412,7 +403,7 @@ RUN ./pkg/plugin/build.sh /work/cache bookworm
412403
FROM scratch AS bookworm
413404
COPY --from=bookworm-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-debian-bookworm.tgz
414405
COPY --from=bookworm-build /google-cloud-ops-agent*.deb /
415-
COPY --from=bookworm-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
406+
COPY --from=bookworm-build /google-cloud-ops-agent-plugin*.tar.gz /
416407

417408
# ======================================
418409
# Build Ops Agent for debian-bullseye
@@ -511,9 +502,6 @@ COPY --from=bullseye-build-diagnostics /work/cache /work/cache
511502
COPY --from=bullseye-build-wrapper /work/cache /work/cache
512503
RUN ./pkg/deb/build.sh
513504

514-
515-
FROM bullseye-build AS bullseye-build-plugin
516-
WORKDIR /work
517505
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
518506
COPY ./builds/ops_agent_plugin.sh .
519507
RUN ./ops_agent_plugin.sh /work/cache/
@@ -523,7 +511,7 @@ RUN ./pkg/plugin/build.sh /work/cache bullseye
523511
FROM scratch AS bullseye
524512
COPY --from=bullseye-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-debian-bullseye.tgz
525513
COPY --from=bullseye-build /google-cloud-ops-agent*.deb /
526-
COPY --from=bullseye-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
514+
COPY --from=bullseye-build /google-cloud-ops-agent-plugin*.tar.gz /
527515

528516
# ======================================
529517
# Build Ops Agent for sles-12
@@ -641,9 +629,6 @@ COPY --from=sles12-build-diagnostics /work/cache /work/cache
641629
COPY --from=sles12-build-wrapper /work/cache /work/cache
642630
RUN ./pkg/rpm/build.sh
643631

644-
645-
FROM sles12-build AS sles12-build-plugin
646-
WORKDIR /work
647632
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
648633
COPY ./builds/ops_agent_plugin.sh .
649634
RUN ./ops_agent_plugin.sh /work/cache/
@@ -653,7 +638,7 @@ RUN ./pkg/plugin/build.sh /work/cache sles12
653638
FROM scratch AS sles12
654639
COPY --from=sles12-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-sles-12.tgz
655640
COPY --from=sles12-build /google-cloud-ops-agent*.rpm /
656-
COPY --from=sles12-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
641+
COPY --from=sles12-build /google-cloud-ops-agent-plugin*.tar.gz /
657642

658643
# ======================================
659644
# Build Ops Agent for sles-15
@@ -757,9 +742,6 @@ COPY --from=sles15-build-diagnostics /work/cache /work/cache
757742
COPY --from=sles15-build-wrapper /work/cache /work/cache
758743
RUN ./pkg/rpm/build.sh
759744

760-
761-
FROM sles15-build AS sles15-build-plugin
762-
WORKDIR /work
763745
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
764746
COPY ./builds/ops_agent_plugin.sh .
765747
RUN ./ops_agent_plugin.sh /work/cache/
@@ -769,7 +751,7 @@ RUN ./pkg/plugin/build.sh /work/cache sles15
769751
FROM scratch AS sles15
770752
COPY --from=sles15-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-sles-15.tgz
771753
COPY --from=sles15-build /google-cloud-ops-agent*.rpm /
772-
COPY --from=sles15-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
754+
COPY --from=sles15-build /google-cloud-ops-agent-plugin*.tar.gz /
773755

774756
# ======================================
775757
# Build Ops Agent for ubuntu-focal
@@ -868,9 +850,6 @@ COPY --from=focal-build-diagnostics /work/cache /work/cache
868850
COPY --from=focal-build-wrapper /work/cache /work/cache
869851
RUN ./pkg/deb/build.sh
870852

871-
872-
FROM focal-build AS focal-build-plugin
873-
WORKDIR /work
874853
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
875854
COPY ./builds/ops_agent_plugin.sh .
876855
RUN ./ops_agent_plugin.sh /work/cache/
@@ -880,7 +859,7 @@ RUN ./pkg/plugin/build.sh /work/cache focal
880859
FROM scratch AS focal
881860
COPY --from=focal-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-ubuntu-focal.tgz
882861
COPY --from=focal-build /google-cloud-ops-agent*.deb /
883-
COPY --from=focal-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
862+
COPY --from=focal-build /google-cloud-ops-agent-plugin*.tar.gz /
884863

885864
# ======================================
886865
# Build Ops Agent for ubuntu-jammy
@@ -979,9 +958,6 @@ COPY --from=jammy-build-diagnostics /work/cache /work/cache
979958
COPY --from=jammy-build-wrapper /work/cache /work/cache
980959
RUN ./pkg/deb/build.sh
981960

982-
983-
FROM jammy-build AS jammy-build-plugin
984-
WORKDIR /work
985961
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
986962
COPY ./builds/ops_agent_plugin.sh .
987963
RUN ./ops_agent_plugin.sh /work/cache/
@@ -991,7 +967,7 @@ RUN ./pkg/plugin/build.sh /work/cache jammy
991967
FROM scratch AS jammy
992968
COPY --from=jammy-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-ubuntu-jammy.tgz
993969
COPY --from=jammy-build /google-cloud-ops-agent*.deb /
994-
COPY --from=jammy-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
970+
COPY --from=jammy-build /google-cloud-ops-agent-plugin*.tar.gz /
995971

996972
# ======================================
997973
# Build Ops Agent for ubuntu-noble
@@ -1090,9 +1066,6 @@ COPY --from=noble-build-diagnostics /work/cache /work/cache
10901066
COPY --from=noble-build-wrapper /work/cache /work/cache
10911067
RUN ./pkg/deb/build.sh
10921068

1093-
1094-
FROM noble-build AS noble-build-plugin
1095-
WORKDIR /work
10961069
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
10971070
COPY ./builds/ops_agent_plugin.sh .
10981071
RUN ./ops_agent_plugin.sh /work/cache/
@@ -1102,7 +1075,7 @@ RUN ./pkg/plugin/build.sh /work/cache noble
11021075
FROM scratch AS noble
11031076
COPY --from=noble-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-ubuntu-noble.tgz
11041077
COPY --from=noble-build /google-cloud-ops-agent*.deb /
1105-
COPY --from=noble-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
1078+
COPY --from=noble-build /google-cloud-ops-agent-plugin*.tar.gz /
11061079

11071080
# ======================================
11081081
# Build Ops Agent for ubuntu-oracular
@@ -1201,9 +1174,6 @@ COPY --from=oracular-build-diagnostics /work/cache /work/cache
12011174
COPY --from=oracular-build-wrapper /work/cache /work/cache
12021175
RUN ./pkg/deb/build.sh
12031176

1204-
1205-
FROM oracular-build AS oracular-build-plugin
1206-
WORKDIR /work
12071177
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
12081178
COPY ./builds/ops_agent_plugin.sh .
12091179
RUN ./ops_agent_plugin.sh /work/cache/
@@ -1213,7 +1183,7 @@ RUN ./pkg/plugin/build.sh /work/cache oracular
12131183
FROM scratch AS oracular
12141184
COPY --from=oracular-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-ubuntu-oracular.tgz
12151185
COPY --from=oracular-build /google-cloud-ops-agent*.deb /
1216-
COPY --from=oracular-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
1186+
COPY --from=oracular-build /google-cloud-ops-agent-plugin*.tar.gz /
12171187

12181188
FROM scratch
12191189
COPY --from=centos8 /* /

‎dockerfiles/template

+1-4
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ COPY --from={target_name}-build-diagnostics /work/cache /work/cache
9191
COPY --from={target_name}-build-wrapper /work/cache /work/cache
9292
{package_build}
9393

94-
95-
FROM {target_name}-build AS {target_name}-build-plugin
96-
WORKDIR /work
9794
COPY cmd/ops_agent_uap_plugin cmd/ops_agent_uap_plugin
9895
COPY ./builds/ops_agent_plugin.sh .
9996
RUN ./ops_agent_plugin.sh /work/cache/
@@ -103,4 +100,4 @@ RUN ./pkg/plugin/build.sh /work/cache {target_name}
103100
FROM scratch AS {target_name}
104101
COPY --from={target_name}-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-{tar_distro_name}.tgz
105102
COPY --from={target_name}-build /google-cloud-ops-agent*.{package_extension} /
106-
COPY --from={target_name}-build-plugin /google-cloud-ops-agent-plugin*.tar.gz /
103+
COPY --from={target_name}-build /google-cloud-ops-agent-plugin*.tar.gz /

‎integration_test/agents/agents.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ func InstallPackageFromGCS(ctx context.Context, logger *log.Logger, vm *gce.VM,
883883
if gce.IsWindows(vm.ImageSpec) {
884884
return installWindowsPackageFromGCS(ctx, logger, vm, gcsPath)
885885
}
886-
if _, err := gce.RunRemotely(ctx, logger, vm, "mkdir -p /tmp/agentUpload"); err != nil {
886+
if _, err := gce.RunRemotely(ctx, logger, vm, "mkdir -p /tmp/agentUpload /tmp/agentPlugin"); err != nil {
887887
return err
888888
}
889889
if err := gce.InstallGsutilIfNeeded(ctx, logger, vm); err != nil {
@@ -899,6 +899,9 @@ func InstallPackageFromGCS(ctx context.Context, logger *log.Logger, vm *gce.VM,
899899
if _, err := gce.RunRemotely(ctx, logger, vm, "rm /tmp/agentUpload/*dbgsym* || echo nothing to delete"); err != nil {
900900
return err
901901
}
902+
if _, err := gce.RunRemotely(ctx, logger, vm, "mv /tmp/agentUpload/*.tar.gz /tmp/agentPlugin || echo nothing to move"); err != nil {
903+
return err
904+
}
902905
if IsRPMBased(vm.ImageSpec) {
903906
if _, err := gce.RunRemotely(ctx, logger, vm, "sudo rpm --upgrade -v --force /tmp/agentUpload/*"); err != nil {
904907
return fmt.Errorf("error installing agent from .rpm file: %v", err)

‎kokoro/scripts/build/build_package.sh

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ docker run \
7878
build_image \
7979
bash <<EOF
8080
cp /google-cloud-ops-agent*.${PKGFORMAT} /artifacts
81+
cp /google-cloud-ops-agent-plugin*.tar.gz /artifacts
8182
8283
if [[ "${PKGFORMAT}" == "rpm" && "${SKIP_SIGNING}" != "true" ]]; then
8384
bash /signing/sign.sh /artifacts/*.rpm

0 commit comments

Comments
 (0)