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

feat(build): add orca-integration module to exercise the just-built docker image #4721

Merged
merged 4 commits into from
May 7, 2024

Conversation

dbyron-sf
Copy link
Contributor

Also, add a healthcheck to the docker images.

to facilitate testing container startup
multi-arch with --load doesn't work, so add a separate step using the local platform to
make an image available for testing.

see docker/buildx#59
@dbyron-sf dbyron-sf added the ready to merge Approved and ready for merge label May 7, 2024
@mergify mergify bot added the auto merged Merged automatically by a bot label May 7, 2024
@mergify mergify bot merged commit b360ad5 into spinnaker:master May 7, 2024
5 checks passed
@dbyron-sf dbyron-sf deleted the test-docker-image branch May 7, 2024 02:37
@dbyron-sf
Copy link
Contributor Author

Similar to spinnaker/clouddriver#6206, there's a bug migrating from release 1.32.x to the current (10-jun-24) HEAD of master when running postgres, and there's a way to demonstrate this with an extension of these tests...but to do that we need a docker image with a HEALTHCHECK in the release-1.32.x branch...

@dbyron-sf
Copy link
Contributor Author

@Mergifyio backport release-1.32.x

Copy link
Contributor

mergify bot commented Jun 10, 2024

backport release-1.32.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jun 10, 2024
…ocker image (#4721)

* feat(docker): add HEALTHCHECK

to facilitate testing container startup

* feat(build): add orca-integration module to exercise the just-built docker image

* feat(gha): run integration test in pr builds

multi-arch with --load doesn't work, so add a separate step using the local platform to
make an image available for testing.

see docker/buildx#59

* feat(gha): run integration test in branch builds

(cherry picked from commit b360ad5)

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/pr.yml
#	Dockerfile.java11.slim
#	Dockerfile.java11.ubuntu
#	Dockerfile.slim
#	Dockerfile.ubuntu
mergify bot added a commit that referenced this pull request Jun 10, 2024
…ocker image (backport #4721) (#4737)

* feat(build): add orca-integration module to exercise the just-built docker image (#4721)

* feat(docker): add HEALTHCHECK

to facilitate testing container startup

* feat(build): add orca-integration module to exercise the just-built docker image

* feat(gha): run integration test in pr builds

multi-arch with --load doesn't work, so add a separate step using the local platform to
make an image available for testing.

see docker/buildx#59

* feat(gha): run integration test in branch builds

(cherry picked from commit b360ad5)

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/pr.yml
#	Dockerfile.java11.slim
#	Dockerfile.java11.ubuntu
#	Dockerfile.slim
#	Dockerfile.ubuntu

* fix(build): resolve conflicts while backporting to release-1.32.x

There are Dockerfile.java11.* files on this branch

* fix(integration): add useJUnitPlatform to orca-integration.gradle

so the tests actually run

---------

Co-authored-by: David Byron <82477955+dbyron-sf@users.noreply.github.com>
Co-authored-by: David Byron <dbyron@salesforce.com>
@dbyron-sf
Copy link
Contributor Author

And similarly, let's backport to 1.33.x and 1.34.x so we can verify fixes there too.

@dbyron-sf
Copy link
Contributor Author

@Mergifyio backport release-1.33.x release-1.34.x

Copy link
Contributor

mergify bot commented Jun 11, 2024

backport release-1.33.x release-1.34.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jun 11, 2024
…ocker image (#4721)

* feat(docker): add HEALTHCHECK

to facilitate testing container startup

* feat(build): add orca-integration module to exercise the just-built docker image

* feat(gha): run integration test in pr builds

multi-arch with --load doesn't work, so add a separate step using the local platform to
make an image available for testing.

see docker/buildx#59

* feat(gha): run integration test in branch builds

(cherry picked from commit b360ad5)
mergify bot pushed a commit that referenced this pull request Jun 11, 2024
…ocker image (#4721)

* feat(docker): add HEALTHCHECK

to facilitate testing container startup

* feat(build): add orca-integration module to exercise the just-built docker image

* feat(gha): run integration test in pr builds

multi-arch with --load doesn't work, so add a separate step using the local platform to
make an image available for testing.

see docker/buildx#59

* feat(gha): run integration test in branch builds

(cherry picked from commit b360ad5)
mergify bot added a commit that referenced this pull request Jun 11, 2024
…ocker image (#4721) (#4740)

* feat(docker): add HEALTHCHECK

to facilitate testing container startup

* feat(build): add orca-integration module to exercise the just-built docker image

* feat(gha): run integration test in pr builds

multi-arch with --load doesn't work, so add a separate step using the local platform to
make an image available for testing.

see docker/buildx#59

* feat(gha): run integration test in branch builds

(cherry picked from commit b360ad5)

Co-authored-by: David Byron <82477955+dbyron-sf@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Jun 11, 2024
…ocker image (#4721) (#4739)

* feat(docker): add HEALTHCHECK

to facilitate testing container startup

* feat(build): add orca-integration module to exercise the just-built docker image

* feat(gha): run integration test in pr builds

multi-arch with --load doesn't work, so add a separate step using the local platform to
make an image available for testing.

see docker/buildx#59

* feat(gha): run integration test in branch builds

(cherry picked from commit b360ad5)

Co-authored-by: David Byron <82477955+dbyron-sf@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto merged Merged automatically by a bot ready to merge Approved and ready for merge target-release/1.35
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants