fix: conflits

.ci/ansible/tasks/runners.yml

@@ -44,15 +44,10 @@
       reaper_mark: "e2e-testing-vm"
       repo: "{{repo | default('Not running on CI')}}"
       run_id: "{{runId | default('Not running on CI')}}"
-<<<<<<< HEAD
-    count_tag:
-      name: "e2e-{{ instanceID }}"
-=======
       division: engineering
       org: obs
       team: eng-productivity
       project: e2e
->>>>>>> d5541388 (fix: remove Helm Chart tests (#3285))
     volumes:
       - device_name: /dev/sda1
         ebs:

.ci/e2eTestingMacosDaily.groovy

@@ -34,18 +34,12 @@ pipeline {
     quietPeriod(10)
   }
   parameters {
-<<<<<<< HEAD
     string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '8.5.4-SNAPSHOT', description: 'SemVer version of the Elastic Agent to be used for the tests. You can use here the tag of your PR to test your changes')
     string(name: 'ELASTIC_STACK_VERSION', defaultValue: '8.5.4-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.')
     string(name: 'BEAT_VERSION', defaultValue: '8.5.4-SNAPSHOT', description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes')
-=======
-    string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '8.7.0-SNAPSHOT', description: 'SemVer version of the Elastic Agent to be used for the tests. You can use here the tag of your PR to test your changes')
-    string(name: 'ELASTIC_STACK_VERSION', defaultValue: '8.7.0-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.')
-    string(name: 'BEAT_VERSION', defaultValue: '8.7.0-SNAPSHOT', description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes')
->>>>>>> d5541388 (fix: remove Helm Chart tests (#3285))
     string(name: 'GITHUB_CHECK_REPO', defaultValue: '', description: 'Name of the GitHub repo to be updated. Only modified if this build is triggered from another parent stream (i.e. Beats).')
     string(name: 'GITHUB_CHECK_SHA1', defaultValue: '', description: 'Git SHA for the Beats upstream project (branch or PR)')
-    choice(name: 'LOG_LEVEL', choices: ['TRACE', 'DEBUG', 'INFO'], description: 'Log level to be used')
+    choice(name: 'LOG_LEVEL', choices: ['INFO', 'DEBUG', 'TRACE'], description: 'Log level to be used')
     choice(name: 'TIMEOUT_FACTOR', choices: ['5', '3', '7', '11'], description: 'Max number of minutes for timeout backoff strategies')
   }
   stages {

.stack-version

@@ -1 +1 @@
-8.5.4-63dd32c9-SNAPSHOT
+8.5.4-63dd32c9-SNAPSHOT

e2e/TROUBLESHOOTING.md

@@ -117,8 +117,6 @@ To change it, please use Docker UI, go to `Preferences > Resources > Advanced`,
 It's important to configure `Docker for Mac` to allow it accessing the `/var/folders` directory, as this framework uses Mac's default temporary directory for storing temporary files.
 
 To change it, please use Docker UI, go to `Preferences > Resources > File Sharing`, and add there `/var/folders` to the list of paths that can be mounted into Docker containers. For more information, please read https://docs.docker.com/docker-for-mac/#file-sharing.
-<<<<<<< HEAD
-=======
 
 ### Unable to create AWS VMS
 - Ensure you have exported the `AWS_SECRET_ACCESS_KEY`and `AWS_ACCESS_KEY_ID` values.
@@ -130,4 +128,3 @@ To change it, please use Docker UI, go to `Preferences > Resources > File Sharin
    - Go to '.venv/bin' folder and activate the python virtual environment.
    - Specify the ansible version in requirement.txt file under `.ci/ansible` folder.
    - Rerun requirements.txt file manually using `pip install -r requirements.txt' command.
->>>>>>> d5541388 (fix: remove Helm Chart tests (#3285))