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

[8.5](backport #3285) fix: remove Helm Chart tests #3334

Merged
merged 3 commits into from
Jan 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 30, 2022

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

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

You are currently cherry-picking commit d5541388.
  (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/.e2e-tests-beats.yaml
	modified:   .ci/.e2e-tests-daily.yaml
	modified:   .ci/.e2e-tests.yaml
	modified:   .ci/Makefile
	modified:   .ci/README.md
	modified:   .ci/ansible/ansible.cfg
	modified:   .ci/ansible/elastic-stack.yml
	modified:   .ci/ansible/fetch-test-reports.yml
	modified:   .ci/ansible/playbook.yml
	modified:   .ci/ansible/requirements.txt
	modified:   .ci/ansible/tasks/copy_test_files.yml
	modified:   .ci/ansible/tasks/fetch_test_reports.yml
	modified:   .ci/ansible/tasks/setup_test_script.yml
	modified:   .ci/ansible/tasks/setup_test_script_windows.yml
	modified:   .ci/ansible/teardown.yml
	deleted:    .ci/e2eTestingHelmDaily.groovy
	deleted:    .ci/jobs/e2e-testing-helm-daily-mbp.yml
	modified:   .ci/schedule-daily.groovy
	modified:   .ci/scripts/functional-test.sh
	new file:   .ci/scripts/gen-platform-env-file.py
	new file:   .ci/scripts/run_filebeat.sh
	deleted:    .ci/scripts/yq.sh
	modified:   .github/paths-labeller.yml
	modified:   README.md
	modified:   e2e/_suites/fleet/features/upgrade_agent.feature
	modified:   e2e/_suites/fleet/fleet_test.go
	deleted:    e2e/_suites/helm/Makefile
	deleted:    e2e/_suites/helm/README.md
	deleted:    e2e/_suites/helm/features/apm_server.feature
	deleted:    e2e/_suites/helm/features/filebeat.feature
	deleted:    e2e/_suites/helm/features/metricbeat.feature
	deleted:    e2e/_suites/helm/helm_charts_test.go
	modified:   e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
	modified:   internal/config/config.go
	modified:   internal/deploy/compose.go
	modified:   internal/deploy/docker.go
	modified:   internal/deploy/docker_client.go
	modified:   internal/deploy/elastic_package.go
	modified:   internal/deploy/kubernetes.go
	modified:   internal/installer/elasticagent_tar.go
	modified:   internal/installer/elasticagent_tar_macos.go
	modified:   internal/installer/elasticagent_zip.go
	modified:   internal/kibana/server.go
	modified:   internal/utils/retry.go
	modified:   internal/utils/utils.go
	modified:   pkg/downloads/buckets.go
	modified:   pkg/downloads/releases.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .ci/Jenkinsfile
	both modified:   .ci/ansible/tasks/runners.yml
	both modified:   .ci/e2eTestingMacosDaily.groovy
	deleted by us:   .ci/jobs/e2e-testing-mbp-tmp.yml
	both modified:   .stack-version
	both modified:   e2e/TROUBLESHOOTING.md
	both modified:   internal/common/defaults.go
	both modified:   internal/config/compose/profiles/fleet/docker-compose.yml
	both modified:   internal/config/compose/services/elastic-agent/cloud/docker-compose.yml
	both modified:   internal/config/compose/services/elastic-agent/docker-compose.yml
	both modified:   internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml
	both modified:   internal/config/compose/services/elasticsearch/docker-compose.yml
	both modified:   internal/config/compose/services/kibana/docker-compose.yml
	both modified:   internal/config/compose/services/metricbeat/docker-compose.yml
	both modified:   internal/config/kubernetes/base/elasticsearch/deployment.yaml
	both modified:   internal/config/kubernetes/base/fleet-server/deployment.yaml
	both modified:   internal/config/kubernetes/base/kibana/deployment.yaml

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

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 30, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Dec 30, 2022

This pull request is now in conflict. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.5/pr-3285 upstream/mergify/bp/8.5/pr-3285
git merge upstream/8.5
git push upstream mergify/bp/8.5/pr-3285

@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 30, 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: 2023-01-03T11:26:20.252+0000

  • Duration: 86 min 2 sec

Test stats 🧪

Test Results
Failed 0
Passed 32
Skipped 0
Total 32

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

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

  • /test : Re-trigger the build.

@mergify
Copy link
Contributor Author

mergify bot commented Jan 2, 2023

This pull request has not been merged yet. Could you please review and merge it @kuisathaverat? 🙏

1 similar comment
@mergify
Copy link
Contributor Author

mergify bot commented Jan 3, 2023

This pull request has not been merged yet. Could you please review and merge it @kuisathaverat? 🙏

apmmachine and others added 3 commits January 3, 2023 12:23
* bump stack version 8.7.0-04d5f080

* fix: remove Helm Chart tests

* test: show env vars and versions

* test: set shell flags

* test: show env

* fix: freeze requirements

* docs: add ec2 issue

* fix: issue with local pyenv versions installed

* fix: improve health checks

* fix: decrease debug level

* fix: add some ansible config

* feat: run filebeat to grab the Docker logs

* fix: add run context

* fix: stop stack

* fix: grab docker logs

* fix: stop stack

* fix: grab junit results

* fix: ignore errors

* fix: typo

* fix: grab stack logs from main agent

* fix: env generation an configuration by default

* docs: wrong steps

* fix: update runners

* fix: improve Stack provision

* fix: remove attribute

* fix: get public IP

* fix: lint

* fix: remove docker pull output

* feat: add clean target

* feat: gran Elastic Agent reports

* fix: remove label setting

* chore: Ansible confing

* fix: set test logs right path

* fix: retry stack deploy

* feat: grab logs

* fix: set proper label

* feat: print logs

* fix: increase retry time

* test: change log to INFO

* fix: sysntax error

* fix: update update test versions

* fix: grab logs

* fix: remove folder before move agent

* fix: change log level

* fix: set command path

* fix: fetch logs

* fix: collect artifacts

* feat: allow overwrite Elastic Stack config

* fix: force binariy path

* fix: test only releases

* fix: report junit test results

* fix: set runner Ip properly

* test: collect logs in a tar file

* fix: wrong flename

* fix: remove fleet folder

* fix: do not log env

* fix: lint

* fix: proper report folder name

* feat: grab logs in fleet mode

* fix: exclude more folders

* fix: exclude elastic-agent binary

* fix: update teardown playbook

* fix: teardown the environment

Co-authored-by: apmmachine <[email protected]>
(cherry picked from commit d554138)
@kuisathaverat kuisathaverat force-pushed the mergify/bp/8.5/pr-3285 branch from 57f115b to 9c77042 Compare January 3, 2023 11:26
@kuisathaverat kuisathaverat merged commit 80abcea into 8.5 Jan 3, 2023
@mergify mergify bot deleted the mergify/bp/8.5/pr-3285 branch January 3, 2023 15:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants