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

[8.3](backport #32251) automate the ironbank docker context generation #32420

Merged
merged 3 commits into from
Jul 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 20, 2022

This is an automatic backport of pull request #32251 done by Mergify.
Cherry-pick of e41dc18 has failed:

On branch mergify/bp/8.3/pr-32251
Your branch is up to date with 'origin/8.3'.

You are currently cherry-picking commit e41dc18a54.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .ci/packaging.groovy
	modified:   auditbeat/magefile.go
	modified:   dev-tools/mage/common.go
	modified:   dev-tools/mage/copy.go
	modified:   dev-tools/mage/pkg.go
	modified:   dev-tools/mage/settings.go
	modified:   dev-tools/make/mage.mk
	new file:   dev-tools/packaging/files/ironbank/LICENSE
	new file:   dev-tools/packaging/files/ironbank/auditbeat/config/auditbeat.yml
	new file:   dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
	new file:   dev-tools/packaging/templates/ironbank/auditbeat/README.md
	new file:   dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
	new file:   dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
	new file:   dev-tools/packaging/templates/ironbank/filebeat/README.md
	new file:   dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
	new file:   dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
	new file:   dev-tools/packaging/templates/ironbank/metricbeat/README.md
	new file:   dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
	new file:   dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
	new file:   dev-tools/packaging/templates/ironbank/packetbeat/README.md
	new file:   dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml
	modified:   filebeat/magefile.go
	modified:   heartbeat/magefile.go
	modified:   metricbeat/magefile.go
	modified:   packetbeat/magefile.go
	modified:   winlogbeat/magefile.go
	modified:   x-pack/auditbeat/magefile.go
	modified:   x-pack/dockerlogbeat/magefile.go
	modified:   x-pack/filebeat/magefile.go
	modified:   x-pack/functionbeat/magefile.go
	modified:   x-pack/heartbeat/magefile.go
	modified:   x-pack/metricbeat/magefile.go
	modified:   x-pack/osquerybeat/magefile.go
	modified:   x-pack/packetbeat/magefile.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/winlogbeat/magefile.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit e41dc18)

# Conflicts:
#	x-pack/winlogbeat/magefile.go
@mergify mergify bot requested review from a team as code owners July 20, 2022 16:00
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 20, 2022
@mergify mergify bot requested review from faec and leehinman and removed request for a team July 20, 2022 16:00
@mergify mergify bot assigned v1v Jul 20, 2022
@botelastic botelastic bot added Team:Automation Label for the Observability productivity team needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 20, 2022
x-pack/winlogbeat/magefile.go Outdated Show resolved Hide resolved
x-pack/winlogbeat/magefile.go Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 20, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-07-21T15:59:24.950+0000

  • Duration: 101 min 10 sec

Test stats 🧪

Test Results
Failed 0
Passed 1548
Skipped 41
Total 1589

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@v1v v1v added automation and removed conflicts There is a conflict in the backported pull request labels Jul 21, 2022
@v1v
Copy link
Member

v1v commented Jul 21, 2022

/test

1 similar comment
@v1v
Copy link
Member

v1v commented Jul 21, 2022

/test

@v1v
Copy link
Member

v1v commented Jul 21, 2022

### Test

Copying gs://beats-ci-artifacts/beats/pull-requests/pr-32420/packetbeat/packetbeat-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz...
/ [1 files][  8.9 KiB/  8.9 KiB]                                                
Operation completed over 1 objects/8.9 KiB.                                      
Copying gs://beats-ci-artifacts/beats/pull-requests/pr-32420/packetbeat/packetbeat-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz.sha512...
/ [1 files][  192.0 B/  192.0 B]                                                
Operation completed over 1 objects/192.0 B.                                      
packetbeat-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz: OK
x Dockerfile
x LICENSE
x README.md
x hardening_manifest.yaml
Dockerfile:ARG ELASTIC_STACK=8.3.3
README.md:[here](https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-8.3.3.html).
file.sh:gsutil cp gs://beats-ci-artifacts/beats/pull-requests/pr-32420/$1/$1-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz .
file.sh:gsutil cp gs://beats-ci-artifacts/beats/pull-requests/pr-32420/$1/$1-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz.sha512 .
file.sh:sha512sum --check $1-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz.sha512
file.sh:tar xvf $1-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz
file.sh:grep 8.3.3 *
hardening_manifest.yaml:  - "8.3.3"
hardening_manifest.yaml:  ELASTIC_STACK: "8.3.3"
hardening_manifest.yaml:  org.opencontainers.image.version: "8.3.3"
hardening_manifest.yaml:  - filename: "packetbeat-8.3.3-linux-x86_64.tar.gz"
hardening_manifest.yaml:    url: "<artifact_path>/packetbeat-8.3.3-linux-x86_64.tar.gz"
packetbeat-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz.sha512:014373df2bfc1ed33b8e40a15731b571895001038420d78c4a245b03cb1acf72eb27d972ed585ee6ae091ae94e818ebbbd4d52fb7a895bf901629a07988f9dd3  packetbeat-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz

@v1v v1v merged commit 1f6f7ac into 8.3 Jul 21, 2022
@mergify mergify bot deleted the mergify/bp/8.3/pr-32251 branch July 21, 2022 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants