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

Add UBI 8 image to Beats dependencies report #21374

Merged
merged 1 commit into from
Sep 29, 2020

Conversation

jsoriano
Copy link
Member

Red Hat certification process for docker images requires to include
the base UBI image in the list of dependencies for the project.
Append it to the current list of dependencies.
This requires to include a new sourceURL column in the CSV, because
UBI images have a different url and source url. This is kept the same
for existing dependencies.

Delimited diff of the generated dependencies csv:

--- dependencies.csv	2020-09-29 11:28:46.136240003 +0200
+++ dependencies.new.csv	2020-09-29 11:27:13.007140360 +0200
@@ -1,373 +1,374 @@
-name,url,version,revision,license
-4d63.com/tz,https://4d63.com/tz,v1.1.1,6d37baae851b,MIT
-cloud.google.com/go,https://cloud.google.com/go,v0.51.0,,Apache-2.0
...
+name,url,version,revision,license,sourceURL
+4d63.com/tz,https://4d63.com/tz,v1.1.1,6d37baae851b,MIT,https://4d63.com/tz
+cloud.google.com/go,https://cloud.google.com/go,v0.51.0,,Apache-2.0,https://cloud.google.com/go
...
+Red Hat Universal Base Image,https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,8,,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz,https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz

Red Hat certification process requires to include the UBI image in the
list of dependencies for the project.
Append it to the current list of dependencies.
This requires to include a new sourceURL column in the CSV, because
UBI images have a different url and source url. This is kept the same
for existing dependencies.
@jsoriano jsoriano added the Team:Automation Label for the Observability productivity team label Sep 29, 2020
@jsoriano jsoriano requested a review from mgreau September 29, 2020 09:33
@jsoriano jsoriano self-assigned this Sep 29, 2020
@botelastic botelastic bot added 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 Sep 29, 2020
@jsoriano jsoriano requested a review from a team September 29, 2020 09:34
@jsoriano jsoriano added needs_backport PR is waiting to be backported to other branches. v7.10.0 labels Sep 29, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 29, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [jsoriano commented: jenkins run the tests please]

  • Start Time: 2020-09-29T14:42:16.568+0000

  • Duration: 81 min 44 sec

Test stats 🧪

Test Results
Failed 0
Passed 20305
Skipped 1858
Total 22163

@jsoriano
Copy link
Member Author

jenkins run the tests please

@jsoriano jsoriano merged commit e6c3d89 into elastic:master Sep 29, 2020
@jsoriano jsoriano deleted the ubi-image-licensing-report branch September 29, 2020 16:40
jsoriano added a commit to jsoriano/beats that referenced this pull request Sep 29, 2020
Red Hat certification process requires to include the UBI image in the
list of dependencies for the project.
Append it to the current list of dependencies.
This requires to include a new sourceURL column in the CSV, because
UBI images have a different url and source url. This is kept the same
for existing dependencies.

(cherry picked from commit e6c3d89)
@jsoriano jsoriano removed the needs_backport PR is waiting to be backported to other branches. label Sep 29, 2020
Copy link
Member

@mgreau mgreau left a comment

Choose a reason for hiding this comment

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

LGTM

v1v added a commit to v1v/beats that referenced this pull request Sep 30, 2020
…ci-build-label-support

* upstream/master:
  [JJBB] Set shallow cloning to 10 (elastic#21409)
  docs: add link to release notes for 7.9.2 (elastic#21405) (elastic#21419)
  docs: Prepare Changelog for 7.9.2 (elastic#21229) (elastic#21403)
  fix: mark flaky tests (elastic#21300)
  fix: use a fixed version of setuptools (elastic#21393)
  Move Kubernetes events metricset to its own block in reference config (elastic#21407)
  [libbeat] Enable WriteAheadLimit in the disk queue (elastic#21391)
  docs: fix apt/yum formatting (elastic#21362)
  Fix shutdown tracking in s3 input (elastic#21380)
  [libbeat] Fix position writing in the disk queue
  Add UBI 8 image to the dependencies report (elastic#21374)
  Fix debug message to show actual SQS message ID (elastic#20614)
  [Elastic Agent] Rename *ConfigChange to PolicyChange (elastic#20779)
  [Elastic Agent] Add install/uninstall sub-command (elastic#21206)
  [Filebeat][httpjson] Make httpjson use cursor input when using date cursor (elastic#20751)
  feat: prepare release pipelines (elastic#21238)
  Add IP validation to Security module (elastic#21325)
jsoriano added a commit that referenced this pull request Oct 1, 2020
Red Hat certification process requires to include the UBI image in the
list of dependencies for the project.
Append it to the current list of dependencies.
This requires to include a new sourceURL column in the CSV, because
UBI images have a different url and source url. This is kept the same
for existing dependencies.

(cherry picked from commit e6c3d89)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Packaging Team:Automation Label for the Observability productivity team v7.10.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants