Skip to content

[8.0](backport #28621) Update runc and containerd#28694

Merged
jsoriano merged 2 commits into8.0from
mergify/bp/8.0/pr-28621
Oct 28, 2021
Merged

[8.0](backport #28621) Update runc and containerd#28694
jsoriano merged 2 commits into8.0from
mergify/bp/8.0/pr-28621

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 28, 2021

This is an automatic backport of pull request #28621 done by Mergify.
Cherry-pick of 97818c3 has failed:

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

You are currently cherry-picking commit 97818c3c2.
  (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:   NOTICE.txt
	modified:   go.mod
	modified:   x-pack/dockerlogbeat/magefile.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum

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.io/

Solve some dependabot warnings (the issues are starting containers
and pulling images, something beats don't do).
Removes a dependency on runc in dockerlogbeat build scripts.

(cherry picked from commit 97818c3)

# Conflicts:
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 28, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 28, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Oct 28, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 28, 2021

💔 Tests Failed

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: 2021-10-28T14:35:13.789+0000

  • Duration: 95 min 32 sec

  • Commit: a45401d

Test stats 🧪

Test Results
Failed 1
Passed 235
Skipped 14
Total 250

Test errors 1

Expand to view the tests failures

Build&Test / metricbeat-pythonIntegTest / test_metricsets_0_stats – metricbeat.tests.system.test_beat.Test
    Expand to view the error details

     Exception: Key 'beat.stats.info.version' found in event is not documented! 
    

    Expand to view the stacktrace

     a = (<test_beat.Test testMethod=test_metricsets_0_stats>,)
    
        @wraps(func)
        def standalone_func(*a):
    >       return func(*(a + p.args), **p.kwargs)
    
    ../build/ve/docker/lib/python3.9/site-packages/parameterized/parameterized.py:518: 
    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
    tests/system/test_beat.py:21: in test_metricsets
        self.check_metricset("beat", metricset, [self.compose_host("metricbeat")], self.FIELDS + ["service"])
    tests/system/metricbeat.py:107: in check_metricset
        self.assert_fields_are_documented(evt)
    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
    
    self = <test_beat.Test testMethod=test_metricsets_0_stats>
    evt = {'@timestamp': '2021-10-28T15:47:03.375Z', 'agent': {'ephemeral_id': 'a907191f-4993-4744-9c36-345a29c8cd84', 'id': 'f7...imit': {'hard': 1048576, 'soft': 1048576}, 'open': 12}, ...}, 'type': 'metricbeat'}, 'ecs': {'version': '1.12.0'}, ...}
    
        def assert_fields_are_documented(self, evt):
            """
            Assert that all keys present in evt are documented in fields.yml.
            This reads from the global fields.yml, means `make collect` has to be run before the check.
            """
            expected_fields, dict_fields, aliases = self.load_fields()
            flat = self.flatten_object(evt, dict_fields)
        
            def field_pattern_match(pattern, key):
                pattern_fields = pattern.split(".")
                key_fields = key.split(".")
                if len(pattern_fields) != len(key_fields):
                    return False
                for i in range(len(pattern_fields)):
                    if pattern_fields[i] == "*":
                        continue
                    if pattern_fields[i] != key_fields[i]:
                        return False
                return True
        
            def is_documented(key, docs):
                if key in docs:
                    return True
                for pattern in (f for f in docs if "*" in f):
                    if field_pattern_match(pattern, key):
                        return True
                return False
        
            for key in flat.keys():
                metaKey = key.startswith('@metadata.')
                # Range keys as used in 'date_range' etc will not have docs of course
                isRangeKey = key.split('.')[-1] in ['gte', 'gt', 'lte', 'lt']
                if not(is_documented(key, expected_fields) or metaKey or isRangeKey):
    >               raise Exception("Key '{}' found in event is not documented!".format(key))
    E               Exception: Key 'beat.stats.info.version' found in event is not documented!
    
    ../libbeat/tests/system/beat/beat.py:729: Exception 
    

Steps errors 4

Expand to view the steps failures

metricbeat-pythonIntegTest - mage pythonIntegTest
  • Took 33 min 8 sec . View more details here
  • Description: mage pythonIntegTest
metricbeat-pythonIntegTest - mage pythonIntegTest
  • Took 23 min 58 sec . View more details here
  • Description: mage pythonIntegTest
metricbeat-pythonIntegTest - mage pythonIntegTest
  • Took 23 min 4 sec . View more details here
  • Description: mage pythonIntegTest
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'hudson.AbortException: script returned exit code 1'

🐛 Flaky test report

❕ There are test failures but not known flaky tests.

Expand to view the summary

Genuine test errors 1

💔 There are test failures but not known flaky tests, most likely a genuine test failure.

  • Name: Build&Test / metricbeat-pythonIntegTest / test_metricsets_0_stats – metricbeat.tests.system.test_beat.Test

🤖 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.

@jsoriano
Copy link
Copy Markdown
Member

/test

@jsoriano
Copy link
Copy Markdown
Member

Failure is unrelated (see #28701), merging.

@jsoriano jsoriano merged commit 6930fa4 into 8.0 Oct 28, 2021
@jsoriano jsoriano deleted the mergify/bp/8.0/pr-28621 branch October 28, 2021 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants