Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

avoid aliases if no major.minor format#2501

Merged
mdelapenya merged 2 commits intoelastic:mainfrom
v1v:feature/avoid-aliases-if-no-alises
May 10, 2022
Merged

avoid aliases if no major.minor format#2501
mdelapenya merged 2 commits intoelastic:mainfrom
v1v:feature/avoid-aliases-if-no-alises

Conversation

@v1v
Copy link
Copy Markdown
Member

@v1v v1v commented May 9, 2022

What does this PR do?

Keep backward compatibility to query the artifacts-api if a version is an alias

Why is it important?

Cornercase when bumping the patch version, since the artifacts-api is not yet available. So the alias detection should not be needed if no passing an alias.

Checklist

Closes #2500

@v1v v1v requested a review from a team May 9, 2022 14:50
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented May 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 added the backport-skip Skip notification from the automated backport with mergify label May 9, 2022
@v1v v1v added backport-v8.3.0 Automated backport with mergify backport-v8.2.0 Automated backport with mergify backport-v7.17.0 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels May 9, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 9, 2022

💔 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: 2022-05-10T08:36:09.362+0000

  • Duration: 67 min 8 sec

Test stats 🧪

Test Results
Failed 1
Passed 135
Skipped 0
Total 136

Test errors 1

Expand to view the tests failures

Initializing / End-To-End Tests / fleet_debian_arm64_system_integration / Adding fsstat system/metrics Integration to a Policy – System Integration
    Expand to view the error details

     Step "system/metrics" with "fsstat" metrics are present in the datastreams 
    

  • no stacktrace

Steps errors 7

Expand to view the steps failures

Executing ansible-playbook
  • Took 14 min 23 sec . View more details here
  • Description: /var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-2501/.venv/bin/ansible-playbook --private-key="/var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-2501/src/github.com/elastic/e2e-testing/e2essh" --extra-vars="workspace=/var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-2501/src/github.com/elastic/e2e-testing/ runId=ec5af7af sshPublicKey=/var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-2501/src/github.com/elastic/e2e-testing/e2essh.pub" --ssh-common-args='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' /var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-2501/src/github.com/elastic/e2e-testing/.ci/ansible/playbook.yml -i "18.222.193.174," -t setup-stack --extra-vars="buildURL=https://beats-ci.elastic.co/job/e2e-tests/job/e2e-testing-mbp/job/PR-2501/4/ gitSha=0ad5423e328699cd91f7090cf63e126f139ee386 build=4 repo=e2e-testing branch=pr-2501 type=ci stackRunner=18.222.193.174 nodeLabel=stack nodeUser=admin nodeImage=ami-0d90bed76900e679a nodeInstanceType=t3.xlarge"
Sleep
  • Took 0 min 5 sec . View more details here
  • Description: 5
Docker login
  • Took 0 min 1 sec . View more details here
  • Description: set +x if command -v host 2>&1 > /dev/null; then host docker.elastic.co 2>&1 > /dev/null fi if command -v dig 2>&1 > /dev/null; then dig docker.elastic.co 2>&1 > /dev/null fi docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}" "docker.elastic.co" 2>/dev/null
Docker login
  • Took 0 min 18 sec . View more details here
  • Description: set +x if command -v host 2>&1 > /dev/null; then host docker.elastic.co 2>&1 > /dev/null fi if command -v dig 2>&1 > /dev/null; then dig docker.elastic.co 2>&1 > /dev/null fi docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}" "docker.elastic.co" 2>/dev/null
Shell Script
  • Took 23 min 53 sec . View more details here
  • Description: ssh -tt -o TCPKeepAlive=yes -o ServerAliveInterval=60 -o ServerAliveCountMax=10 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /var/lib/jenkins/workspace/PR-2501-4-e17afe13-d6dd-4d41-ae05-2c48a0a7d6d2/e2essh admin@13.58.89.154 -- 'sudo bash /home/admin/e2e-testing/.ci/scripts/functional-test.sh'
Archive the artifacts
  • Took 0 min 1 sec . View more details here
  • Description: [2022-05-10T09:38:50.828Z] Archiving artifacts script returned exit code 2
Docker login
  • Took 0 min 18 sec . View more details here
  • Description: set +x if command -v host 2>&1 > /dev/null; then host docker.elastic.co 2>&1 > /dev/null fi if command -v dig 2>&1 > /dev/null; then dig docker.elastic.co 2>&1 > /dev/null fi docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}" "docker.elastic.co" 2>/dev/null

🐛 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: Initializing / End-To-End Tests / fleet_debian_arm64_system_integration / Adding fsstat system/metrics Integration to a Policy – System Integration

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@mdelapenya
Copy link
Copy Markdown
Contributor

Let's wait for the second build, using 8.2 parameters, so we can merge

@mdelapenya
Copy link
Copy Markdown
Contributor

Before merging, let me check the k8s-autodiscover scenarios: they are all failing

@mdelapenya
Copy link
Copy Markdown
Contributor

mdelapenya commented May 10, 2022

Before merging, let me check the k8s-autodiscover scenarios: they are all failing

Ok, it failed because this block:

err = deploy.TagImage(
	"docker.elastic.co/"+namespace+"/"+podName+":"+downloads.GetSnapshotVersion(common.BeatVersionBase),
	"docker.elastic.co/observability-ci/"+podName+":"+beatVersion,
)

the source image, "docker.elastic.co/"+namespace+"/"+podName+":"+downloads.GetSnapshotVersion(common.BeatVersionBase) does not exist locally because it uses BeatVersionBase, which is 8.3.0-hash-SNAPSHOT for the main branch. Because in the build we used 8.2.1 as BEAT_VERSION to simulate a build in 8.2 (to avoid merging blindly and backporting to 8.2), it failed because of that.

@v1v let me trigger the build for the current main branch using a GIT_SHA for 8.3.0 (main): 9fc1c71e58e1637ab0377bf799784de23a7b7604. If the build passes, it should pass in 8.2 and any other maintenance branch.

commit SHA: elastic/beats@9fc1c71
packaging job: https://beats-ci.elastic.co/job/Beats/job/packaging/job/main/594/

Build for the E2E: https://beats-ci.elastic.co/job/e2e-tests/job/e2e-testing-mbp/job/PR-2501/4/

@mdelapenya
Copy link
Copy Markdown
Contributor

Build seems correct so far. Once finished, will merge and backport this one

Screenshot 2022-05-10 at 11 29 02

@mdelapenya mdelapenya merged commit 4579092 into elastic:main May 10, 2022
@mdelapenya
Copy link
Copy Markdown
Contributor

Test error is not related and marked as flaky

mergify bot pushed a commit that referenced this pull request May 10, 2022
* Use alias only if two digits release

* fix regex

(cherry picked from commit 4579092)
mergify bot pushed a commit that referenced this pull request May 10, 2022
* Use alias only if two digits release

* fix regex

(cherry picked from commit 4579092)
@mdelapenya mdelapenya added backport-v8.1.0 Automated backport with mergify and removed backport-v8.3.0 Automated backport with mergify labels May 10, 2022
@mdelapenya
Copy link
Copy Markdown
Contributor

@mergify refresh

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented May 10, 2022

refresh

✅ Pull request refreshed

mergify bot pushed a commit that referenced this pull request May 10, 2022
* Use alias only if two digits release

* fix regex

(cherry picked from commit 4579092)
mdelapenya pushed a commit that referenced this pull request May 10, 2022
* Use alias only if two digits release

* fix regex

(cherry picked from commit 4579092)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
mdelapenya pushed a commit that referenced this pull request May 10, 2022
* Use alias only if two digits release

* fix regex

(cherry picked from commit 4579092)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
mdelapenya pushed a commit that referenced this pull request May 10, 2022
* Use alias only if two digits release

* fix regex

(cherry picked from commit 4579092)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
mdelapenya added a commit to mdelapenya/e2e-testing that referenced this pull request May 10, 2022
* main:
  avoid aliases if no major.minor format (elastic#2501)
mdelapenya added a commit to mdelapenya/e2e-testing that referenced this pull request May 22, 2022
* main:
  bump stack version 8.3.0-8ee1196f (elastic#2519)
  ci: daily pipeline to use main branch (elastic#2516)
  bump stack version 8.3.0-53513548 (elastic#2513)
  chore: run reaper daily at 1:30 am (elastic#2512)
  avoid aliases if no major.minor format (elastic#2501)
  bump stack version 8.3.0-d380914f (elastic#2505)
  chore: refactor cucumber tags (elastic#2496)
  chore: skip system-integration scenarios for Beats (elastic#2482)
  bump stack version 8.3.0-5c1ff35f (elastic#2494)
  chore: reduce AWS instances size (elastic#2477)
  chore: wait for the stack while provisioning (elastic#2486)
  bump stack version 8.3.0-6ba9f710 (elastic#2484)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport-v7.17.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify backport-v8.2.0 Automated backport with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Do not use aliases when checking versions

4 participants