diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index a33c411e6f..eb8b85a6a6 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -93,6 +93,7 @@ pipeline { def basicTasks = [ 'stack-command-default': generateTestCommandStage(command: 'test-stack-command-default', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*']), 'stack-command-7x': generateTestCommandStage(command: 'test-stack-command-7x', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*']), + 'stack-command-800': generateTestCommandStage(command: 'test-stack-command-800', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*']), 'stack-command-8x': generateTestCommandStage(command: 'test-stack-command-8x', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*']), 'check-packages-with-kind': generateTestCommandStage(command: 'test-check-packages-with-kind', artifacts: ['build/test-results/*.xml', 'build/kubectl-dump.txt', 'build/elastic-stack-dump/check-*/logs/*.log', 'build/elastic-stack-dump/check-*/logs/fleet-server-internal/*'], junitArtifacts: true, publishCoverage: true), 'check-packages-other': generateTestCommandStage(command: 'test-check-packages-other', artifacts: ['build/test-results/*.xml', 'build/elastic-stack-dump/check-*/logs/*.log', 'build/elastic-stack-dump/check-*/logs/fleet-server-internal/*'], junitArtifacts: true, publishCoverage: true), @@ -160,7 +161,7 @@ def generateTestCheckSinglePackageStage(Map args = [:]) { withMageEnv(){ withCloudTestEnv() { sh(label: 'Build elastic-package',script: "make build") - sh(label: 'Build elastic-package',script: "make PACKAGE_UNDER_TEST=${it} test-check-packages-with-parallel") + sh(label: 'Build elastic-package',script: "make PACKAGE_UNDER_TEST=${it} test-check-packages-parallel") } } } diff --git a/Makefile b/Makefile index 23956aa4ad..9ee884c231 100644 --- a/Makefile +++ b/Makefile @@ -46,14 +46,17 @@ test-stack-command-default: ./scripts/test-stack-command.sh test-stack-command-7x: - ./scripts/test-stack-command.sh 7.16.0-SNAPSHOT + ./scripts/test-stack-command.sh 7.16.3-SNAPSHOT -test-stack-command-8x: +test-stack-command-800: ./scripts/test-stack-command.sh 8.0.0-SNAPSHOT -test-stack-command: test-stack-command-default test-stack-command-7x test-stack-command-8x +test-stack-command-8x: + ./scripts/test-stack-command.sh 8.1.0-SNAPSHOT + +test-stack-command: test-stack-command-default test-stack-command-7x test-stack-command-800 test-stack-command-8x -test-check-packages: test-check-packages-with-kind test-check-packages-with-other test-check-packages-with-parallel +test-check-packages: test-check-packages-with-kind test-check-packages-other test-check-packages-parallel test-check-packages-with-kind: PACKAGE_TEST_TYPE=with-kind ./scripts/test-check-packages.sh @@ -61,7 +64,7 @@ test-check-packages-with-kind: test-check-packages-other: PACKAGE_TEST_TYPE=other ./scripts/test-check-packages.sh -test-check-packages-with-parallel: +test-check-packages-parallel: PACKAGE_TEST_TYPE=parallel ./scripts/test-check-packages.sh test-build-zip: diff --git a/internal/install/stack_version.go b/internal/install/stack_version.go index 5886deb1a0..831119ce61 100644 --- a/internal/install/stack_version.go +++ b/internal/install/stack_version.go @@ -6,5 +6,5 @@ package install const ( // DefaultStackVersion is the default version of the stack - DefaultStackVersion = "7.16.0" + DefaultStackVersion = "7.16.2" )