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.

Sign up for GitHub

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

Update new-distro.md #1475

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Update new-distro.md #1475

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11933a2
Update new-distro.md
sophieyfang Oct 23, 2023
769abcd
Update new-distro.md
sophieyfang Oct 24, 2023
a45dddc
Merge branch 'master' into sophieyfang-patch-1
sophieyfang Oct 24, 2023
58afbe8
Update new-distro.md
sophieyfang Oct 25, 2023
cd7f52a
Merge branch 'master' into sophieyfang-patch-1
martijnvans Oct 26, 2023
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
10 changes: 6 additions & 4 deletions dev-docs/new-distro.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ for the new distro. You can duplicate the most recent distro as a starting
point. Then iterate on your change to `compile.go` by running:

```shell
go run dockerfiles/compile.go && docker build --target $DISTRO_SHORT -t scratch .
go run dockerfiles/compile.go && DOCKER_BUILDKIT=1 docker build --target $DISTRO_SHORT -t scratch .
```

See [Troubleshooting](#troubleshooting) if you have problems. Once that
Expand All @@ -39,10 +39,12 @@ manifest as runtime errors that won't show up until tests are run.

1. Temporarily repurpose one of the existing Kokoro builds for testing
your new distro. For example, in
[build/presubmit/bullseye.gcl](https://github.com/GoogleCloudPlatform/ops-agent/blob/master/kokoro/config/build/presubmit/bullseye.gcl),
[kokoro/config/build/presubmit/bullseye_x86_64.gcl](https://github.com/GoogleCloudPlatform/ops-agent/blob/master/kokoro/config/build/presubmit/bullseye_x86_64.gcl)
or [kokoro/config/build/presubmit/bullseye_aarch64.gcl](https://github.com/GoogleCloudPlatform/ops-agent/blob/master/kokoro/config/build/presubmit/bullseye_aarch64.gcl),
replace `bullseye` with `$DISTRO_SHORT` and change `deb` to `rpm` if
needed. Then in
[test/ops_agent/bullseye.gcl](https://github.com/GoogleCloudPlatform/ops-agent/blob/master/kokoro/config/test/ops_agent/bullseye.gcl),
[kokoro/config/test/ops_agent/bullseye_x86_64.gcl](https://github.com/GoogleCloudPlatform/ops-agent/blob/master/kokoro/config/test/ops_agent/bullseye_x86_64.gcl)
or [kokoro/config/test/ops_agent/bullseye_aarch64.gcl](https://github.com/GoogleCloudPlatform/ops-agent/blob/master/kokoro/config/test/ops_agent/bullseye_aarch64.gcl),
sophieyfang marked this conversation as resolved.
Show resolved Hide resolved
replace `image_lists.debian.distros.bullseye.presubmit` with
`$DISTRO_FAMILY`. This will cause the `bullseye` Kokoro build to build
and test your distro instead.
Expand All @@ -56,7 +58,7 @@ manifest as runtime errors that won't show up until tests are run.

1. Once builds and "Ops Agent integration test" (AKA `ops_agent_test`) are
passing, Revert the temporary changes to the Kokoro configs (the two
`bullseye.gcl` files in the earlier step). Get your PR reviewed and
`bullseye_$arch.gcl` files in the earlier step). Get your PR reviewed and
merge it to `master`.

### Running `third_party_apps_test` against the new distro
Expand Down
Loading