logstash icon indicating copy to clipboard operation
logstash copied to clipboard

Backport of env2yaml arm64 Docker build context fixes

Open robbavey opened this issue 1 year ago • 5 comments

This commit contains fixes made to the main 8.x branch to generate arm64 and amd64 env2yaml binaries, copy them into the build context and correctly identify the correct binary in the Dockerfile to include in the Docker image.

A clean backport was not available due to the change in format of Dockerfile template from j2 to erb in #15142

This contains fixes from #15980 and #16053.

Release notes

What does this PR do?

Why is it important/What is the impact to the user?

Checklist

  • [ ] My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files (and/or docker env variables)
  • [ ] I have added tests that prove my fix is effective or that my feature works

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

robbavey avatar Apr 05 '24 19:04 robbavey

Docker Integration tests:

https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline/builds/372 https://buildkite.com/elastic/logstash-aarch64-pipeline/builds/87

robbavey avatar Apr 09 '24 15:04 robbavey

Ready for another round - buildkite exhaustive tests are failing before they reach the Docker tests, unfortunately

robbavey avatar Apr 10 '24 19:04 robbavey

I kicked off exhaustive tests here: https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline/builds/396

jsvd avatar Apr 16 '24 10:04 jsvd

@robbavey looks like we're hitting issues with j2 templating:

jinja2.exceptions.TemplateSyntaxError: Encountered unknown tag 'arch_command'. Jinja was looking for the following tags: 'elif' or 'else' or 'endif'. The innermost block that needs to be closed is 'if'.

more at https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline/builds/396#018ee662-c331-4c4f-b3f5-ca8ef8c2cc22/112-6001

jsvd avatar Apr 17 '24 09:04 jsvd

:green_heart: Build Succeeded

History

  • :green_heart: Build #1029 succeeded ae312b2070c50e3bb49b557ee110a808d7e2cdfb
  • :green_heart: Build #1028 succeeded 02f1fc7f6bd67175467b4f19700d3db862c566d3
  • :green_heart: Build #1020 succeeded eab0fd35b9910ed40a17c9db29ec9cab444e18eb
  • :green_heart: Build #1013 succeeded 54a79bd6d498ad1eff8b901efe4c46cb157c1bb4

elasticmachine avatar Apr 17 '24 13:04 elasticmachine