Skip to content

ci: configure kind/k8s for k8s in metricbeat only#30747

Merged
v1v merged 2 commits intoelastic:mainfrom
v1v:feature/kind-k8s-metricbeat-int-test
Mar 9, 2022
Merged

ci: configure kind/k8s for k8s in metricbeat only#30747
v1v merged 2 commits intoelastic:mainfrom
v1v:feature/kind-k8s-metricbeat-int-test

Conversation

@v1v
Copy link
Copy Markdown
Member

@v1v v1v commented Mar 9, 2022 •
edited
Loading

What does this PR do?

Add support for installing kind/k8s only if running the metricbeat goIngTest stage.

NOTE: kind/k8s is only needed when testing the k8s module, so it might be installed for other modules, but this is the approach we can without much complexity in the CI.

Why is it important?

The k8s module is tested in two places:

  1. beats/deploy/kubernetes/Jenkinsfile.yml

    Lines 20 to 22 in 9e6536d

    k8sTest:
    k8sTest: "v1.23.4,v1.22.7,v1.21.10"
    stage: mandatory
    and

    beats/Jenkinsfile

    Line 323 in 9e6536d

    sh(label: "Integration tests", script: "MODULE=kubernetes make -C metricbeat integration-tests")

  2. beats/metricbeat/Jenkinsfile.yml

    Lines 27 to 30 in 9e6536d

    goIntegTest:
    mage: "mage goIntegTest"
    withModule: true
    stage: mandatory

Only 1 is in charge to install the given Kind and K8s versions. but 2 requires those tools. Those tools are installed in the CI workers as part of the default installed toolchain (kind version v0.7.0 and k8s version v0.12.0.

This proposal is trying to leverage the IntTests for metricbeat by installing the k8s/kind when needed, unfortunately we cannot do only when the module is not k8s, unless the build system in metricbeat is in charge of preparing the environment.

Related issues

@v1v v1v requested a review from ChrsMark March 9, 2022 12:08
@v1v v1v requested a review from a team as a code owner March 9, 2022 12:08
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label Team:Automation Label for the Observability productivity team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 9, 2022
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 9, 2022

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot assigned v1v Mar 9, 2022
@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Mar 9, 2022
ChrsMark
ChrsMark approved these changes Mar 9, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

lgtm, thank you for fixing this!

@ChrsMark ChrsMark mentioned this pull request Mar 9, 2022
Merged
@v1v v1v added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify labels Mar 9, 2022
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Mar 9, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Mar 9, 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](https://ci-stats.elastic.co/app/apm/services/beats-ci/transactions/view?rangeFrom=2022-03-09T11:58:59.608Z&rangeTo=2022-03-09T12:18:59.608Z&transactionName=BUILD Beats/beats/PR-{number}&transactionType=job&latencyAggregationType=avg&traceId=19ba9d6e37ffb5ae8efaa0b39ab727c1&transactionId=c36d2a1384de7e5d)

Expand to view the summary

Build stats

  • Start Time: 2022-03-09T12:08:59.608+0000

  • Duration: 124 min 51 sec

Test stats 🧪

Test Results
Failed 0
Passed 43014
Skipped 3846
Total 46860

💚 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!)

@ChrsMark
Copy link
Copy Markdown
Member

ChrsMark commented Mar 9, 2022

@v1v I think we can merge this one?

@v1v v1v merged commit 3560733 into elastic:main Mar 9, 2022
mergify bot pushed a commit that referenced this pull request Mar 9, 2022
@v1v
ci: configure kind/k8s for k8s in metricbeat only (#30747)
3403d22 
(cherry picked from commit 3560733)

# Conflicts:
#	Jenkinsfile
@mergify mergify bot mentioned this pull request Mar 9, 2022
Merged
mergify bot pushed a commit that referenced this pull request Mar 9, 2022
@v1v
ci: configure kind/k8s for k8s in metricbeat only (#30747)
481ca0f 
(cherry picked from commit 3560733)

# Conflicts:
#	Jenkinsfile
@mergify mergify bot mentioned this pull request Mar 9, 2022
Merged
mergify bot pushed a commit that referenced this pull request Mar 9, 2022
@v1v
ci: configure kind/k8s for k8s in metricbeat only (#30747)
beecea5 
(cherry picked from commit 3560733)

# Conflicts:
#	Jenkinsfile
@mergify mergify bot mentioned this pull request Mar 9, 2022
Merged
@ChrsMark ChrsMark mentioned this pull request Mar 16, 2022
Merged
@v1v v1v added the backport-skip Skip notification from the automated backport with mergify label Mar 16, 2022
@ChrsMark ChrsMark mentioned this pull request Mar 16, 2022
Merged
v1v pushed a commit that referenced this pull request Mar 17, 2022
@mergify
[7.17](backport #30747) ci: configure kind/k8s for k8s in metricbeat …
c3e0b4e 
…only (#30752)
v1v pushed a commit that referenced this pull request Mar 17, 2022
@mergify
[8.0](backport #30747) ci: configure kind/k8s for k8s in metricbeat o…
2ed1a59 
…nly (#30753)
v1v pushed a commit that referenced this pull request Mar 17, 2022
@mergify
[8.1](backport #30747) ci: configure kind/k8s for k8s in metricbeat o…
05a9650 
…nly (#30754)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@mergify
[8.0](backport elastic#30747) ci: configure kind/k8s for k8s in metri…
54b6c63 
…cbeat only (elastic#30753)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

+1 more reviewer

@mdelapenya mdelapenya mdelapenya approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@v1v v1v

Labels

backport-7.17 Automated backport to the 7.17 branch with mergify backport-skip Skip notification from the automated backport with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify Team:Automation Label for the Observability productivity team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@v1v @elasticmachine @ChrsMark @mdelapenya