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

[Fleet] Fix docker publish step in buildkite #2815

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Conversation

nchaulet
Copy link
Member

Description

Fix docker publish step in buildkite

The if condition to build the docker image was not met
Screenshot 2023-07-24 at 1 00 56 PM

It seems according to buildkite doc that BUILDKITE_PULL_REQUEST should be false if it's not a pull request and not an empty string

@nchaulet nchaulet added the Team:Fleet Label for the Fleet team label Jul 24, 2023
@nchaulet nchaulet requested a review from a team as a code owner July 24, 2023 17:02
@nchaulet nchaulet self-assigned this Jul 24, 2023
@@ -105,6 +105,8 @@ steps:
env:
SERVICE_COMMIT_HASH: ${BUILDKITE_COMMIT:0:12}
REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/fleet/config.yaml
depends_on:
- step: "publish"
Copy link
Member Author

Choose a reason for hiding this comment

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

I added a dependency here so we do not update tags with non valid image

Copy link
Contributor

@michel-laterman michel-laterman left a comment

Choose a reason for hiding this comment

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

lgtm

@nchaulet
Copy link
Member Author

@michel-laterman should we replace the fleet-server/pr-merge as required by buildkite/fleet-server ? How and who can do that?

@jlind23
Copy link
Contributor

jlind23 commented Jul 25, 2023

@nchaulet I just fixed this by adding buildkite as a required step and removed the jenkins one.

@jlind23 jlind23 merged commit 5cce568 into main Jul 25, 2023
6 checks passed
@jlind23 jlind23 deleted the fix-docker-publish-images branch July 25, 2023 07:04
@jlind23 jlind23 added the backport-v8.9.0 Automated backport with mergify label Jul 26, 2023
mergify bot pushed a commit that referenced this pull request Jul 26, 2023
(cherry picked from commit 5cce568)

# Conflicts:
#	.buildkite/pipeline.yml
jlind23 added a commit that referenced this pull request Jul 26, 2023
…2818)

* [Fleet] Fix docker publish step in buildkite (#2815)

(cherry picked from commit 5cce568)

# Conflicts:
#	.buildkite/pipeline.yml

* Update pipeline.yml

Fix conflicts

---------

Co-authored-by: Nicolas Chaulet <[email protected]>
Co-authored-by: Julien Lind <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.9.0 Automated backport with mergify Team:Fleet Label for the Fleet team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants