Skip to content

Commit

Permalink
Update k8s-extended-tests.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrehilbert authored and ycombinator committed Oct 30, 2024
1 parent cfa2e21 commit 0cfc757
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions .buildkite/scripts/steps/k8s-extended-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,8 @@ else
exit 10
fi

<<<<<<< HEAD
AGENT_PACKAGE_VERSION="8.16.0" DEV=true SNAPSHOT=true EXTERNAL=true PACKAGES=docker mage -v package
AGENT_VERSION="8.16.0-SNAPSHOT" AGENT_STACK_VERSION="8.16.0-SNAPSHOT" TEST_INTEG_CLEAN_ON_EXIT=true INSTANCE_PROVISIONER=kind STACK_PROVISIONER=stateful SNAPSHOT=true mage integration:kubernetesMatrix
=======
AGENT_PACKAGE_VERSION="8.16.0" SNAPSHOT=true EXTERNAL=true PACKAGES=docker mage -v package
AGENT_VERSION="8.16.0-SNAPSHOT" TEST_INTEG_CLEAN_ON_EXIT=true INSTANCE_PROVISIONER=kind STACK_PROVISIONER=stateful SNAPSHOT=true mage integration:kubernetesMatrix
>>>>>>> c9cd580456 (Fix like https://github.com/elastic/beats/issues/41270 (#5868))
AGENT_VERSION="8.16.0-SNAPSHOT" AGENT_STACK_VERSION="8.16.0-SNAPSHOT" TEST_INTEG_CLEAN_ON_EXIT=true INSTANCE_PROVISIONER=kind STACK_PROVISIONER=stateful SNAPSHOT=true mage integration:kubernetesMatrix
TESTS_EXIT_STATUS=$?
set -e

Expand Down

0 comments on commit 0cfc757

Please sign in to comment.