Skip to content
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.

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

CI: only push tar instead of also container image #925

Merged
merged 1 commit into from
Jul 8, 2024
Merged
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions test/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function build-pr() {
export REGISTRY="${NPD_STAGING_REGISTRY}/pr/${PR}"
export VERSION=$(get-version)
export TAG="${VERSION}"
make push
make push-tar
Copy link
Member Author

@BenTheElder BenTheElder Jul 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: pull-npd-build already runs make build which includes build-container, so there's no reason to build it in PR e2e runs.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(specifically it runs ./test/build.sh install-lib && make build)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment here to explain that this is only used by presubmit e2e? The build job is using make build which covers container build already?

write-env-file ${PR_ENV_FILENAME}
}

Expand All @@ -138,7 +138,10 @@ function build-ci() {
export REGISTRY="${NPD_STAGING_REGISTRY}/ci"
export VERSION="$(get-version)-$(date +%Y%m%d.%H%M)"
export TAG="${VERSION}"
make push
# e2e tests consume the tarball, not the container
# this is simpler to manage in the infra, and we still ensure the container
# build works locally
make push-tar build-container
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a comment to explain that we do not need to push container here for CI tests.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


# Create the env file with and without custom flags at the same time.
build-npd-custom-flags
Expand Down