-
Notifications
You must be signed in to change notification settings - Fork 169
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add explicit ARG VERSION to RP build stage in ci-rp (#3597)
- Loading branch information
Showing
2 changed files
with
5 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
ARG REGISTRY | ||
ARG VERSION | ||
ARG ARO_VERSION | ||
|
||
############################################################################### | ||
# Stage 1: Build the SRE Portal Assets | ||
|
@@ -22,6 +22,7 @@ RUN npm run lint && npm run build | |
# Stage 2: Compile the Golang RP code | ||
############################################################################### | ||
FROM ${REGISTRY}/ubi8/go-toolset:1.20.12-5 AS builder | ||
ARG ARO_VERSION | ||
USER root | ||
WORKDIR /app | ||
|
||
|
@@ -49,8 +50,8 @@ COPY --from=portal-build /build/pkg/portal/assets/v2/build /app/pkg/portal/asset | |
# Lint, generate, build, and test | ||
RUN golangci-lint run --verbose | ||
RUN go generate ./... | ||
RUN go build -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=${VERSION}" ./cmd/aro | ||
RUN go test ./test/e2e/... -tags e2e,codec.safe -c -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=${VERSION}" -o e2e.test | ||
RUN go build -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=${ARO_VERSION}" ./cmd/aro | ||
RUN go test ./test/e2e/... -tags e2e,codec.safe -c -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=${ARO_VERSION}" -o e2e.test | ||
|
||
# Additional tests | ||
RUN ARO_RUN_PKI_TESTS=nope go run gotest.tools/[email protected] --format pkgname --junitfile report.xml -- -coverprofile=cover.out ./... | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters