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

Commit

Permalink
chore: bump versions for 7.11.x (#581)
Browse files Browse the repository at this point in the history
  • Loading branch information
mdelapenya authored Jan 12, 2021
1 parent e2259ff commit 5bace2a
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 32 deletions.
10 changes: 5 additions & 5 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ pipeline {
booleanParam(name: "forceSkipPresubmit", defaultValue: false, description: "If it's needed to execute the pre-submit tests: unit and precommit.")
booleanParam(name: "notifyOnGreenBuilds", defaultValue: false, description: "If it's needed to notify with green builds.")
string(name: 'SLACK_CHANNEL', defaultValue: 'observablt-bots', description: 'The Slack channel(s) where errors will be posted. For multiple channels, use a comma-separated list of channels')
string(name: 'ELASTIC_AGENT_DOWNLOAD_URL', defaultValue: '', description: 'If present, it will override the download URL for the Elastic agent artifact. (I.e. https://snapshots.elastic.co/8.0.0-59098054/downloads/beats/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-linux-x86_64.tar.gz')
string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the stand-alone elastic-agent to be used for Fleet tests. You can use here the tag of your PR to test your changes')
string(name: 'ELASTIC_AGENT_DOWNLOAD_URL', defaultValue: '', description: 'If present, it will override the download URL for the Elastic agent artifact. (I.e. https://snapshots.elastic.co/7.11.0-326bd5a6/downloads/beats/elastic-agent/elastic-agent-7.11.0-SNAPSHOT-linux-x86_64.tar.gz')
string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.11.0-SNAPSHOT', description: 'SemVer version of the stand-alone elastic-agent to be used for Fleet tests. You can use here the tag of your PR to test your changes')
string(name: 'ELASTIC_AGENT_STALE_VERSION', defaultValue: '7.10.1', description: 'SemVer version of the stale stand-alone elastic-agent to be used for Fleet upgrade tests.')
booleanParam(name: "BEATS_USE_CI_SNAPSHOTS", defaultValue: false, description: "If it's needed to use the binary snapshots produced by Beats CI instead of the official releases")
choice(name: 'LOG_LEVEL', choices: ['DEBUG', 'INFO'], description: 'Log level to be used')
choice(name: 'TIMEOUT_FACTOR', choices: ['3', '5', '7', '11'], description: 'Max number of minutes for timeout backoff strategies')
string(name: 'FLEET_STACK_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the stack to be used for Fleet tests.')
string(name: 'METRICBEAT_STACK_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the stack to be used for Metricbeat tests.')
string(name: 'METRICBEAT_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the metricbeat to be used.')
string(name: 'FLEET_STACK_VERSION', defaultValue: '7.11.0-SNAPSHOT', description: 'SemVer version of the stack to be used for Fleet tests.')
string(name: 'METRICBEAT_STACK_VERSION', defaultValue: '7.11.0-SNAPSHOT', description: 'SemVer version of the stack to be used for Metricbeat tests.')
string(name: 'METRICBEAT_VERSION', defaultValue: '7.11.0-SNAPSHOT', description: 'SemVer version of the metricbeat to be used.')
string(name: 'HELM_CHART_VERSION', defaultValue: '7.10.0', description: 'SemVer version of Helm chart to be used.')
string(name: 'HELM_VERSION', defaultValue: '3.4.1', description: 'SemVer version of Helm to be used.')
string(name: 'HELM_KIND_VERSION', defaultValue: '0.8.1', description: 'SemVer version of Kind to be used.')
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/clean-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -euxo pipefail
# Build and test the app using the install and test make goals.
#

readonly VERSION="8.0.0-SNAPSHOT"
readonly VERSION="7.11.0-SNAPSHOT"

main() {
# refresh docker images
Expand Down
8 changes: 4 additions & 4 deletions .ci/scripts/functional-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ set -euxo pipefail
# Parameters:
# - SUITE - that's the suite to be tested. Default '' which means all of them.
# - TAGS - that's the tags to be tested. Default '' which means all of them.
# - STACK_VERSION - that's the version of the stack to be tested. Default '8.0.0-SNAPSHOT'.
# - METRICBEAT_VERSION - that's the version of the metricbeat to be tested. Default '8.0.0-SNAPSHOT'.
# - STACK_VERSION - that's the version of the stack to be tested. Default '7.11.0-SNAPSHOT'.
# - METRICBEAT_VERSION - that's the version of the metricbeat to be tested. Default '7.11.0-SNAPSHOT'.
#

SUITE=${1:-''}
TAGS=${2:-''}
STACK_VERSION=${3:-'8.0.0-SNAPSHOT'}
METRICBEAT_VERSION=${4:-'8.0.0-SNAPSHOT'}
STACK_VERSION=${3:-'7.11.0-SNAPSHOT'}
METRICBEAT_VERSION=${4:-'7.11.0-SNAPSHOT'}
TARGET_OS=${GOOS:-linux}
TARGET_ARCH=${GOARCH:-amd64}

Expand Down
4 changes: 2 additions & 2 deletions cli/config/compose/profiles/fleet/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
- xpack.security.authc.api_key.enabled=true
- ELASTIC_USERNAME=elastic
- ELASTIC_PASSWORD=changeme
image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.0.0-SNAPSHOT}"
image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.11.0-SNAPSHOT}"
ports:
- "9200:9200"
kibana:
Expand All @@ -29,7 +29,7 @@ services:
test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null"
retries: 600
interval: 1s
image: "docker.elastic.co/kibana/kibana:${stackVersion:-8.0.0-SNAPSHOT}"
image: "docker.elastic.co/kibana/kibana:${stackVersion:-7.11.0-SNAPSHOT}"
ports:
- "5601:5601"
volumes:
Expand Down
2 changes: 1 addition & 1 deletion cli/config/compose/profiles/metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ services:
- xpack.monitoring.collection.enabled=true
- ELASTIC_USERNAME=elastic
- ELASTIC_PASSWORD=changeme
image: "docker.elastic.co/observability-ci/elasticsearch:${stackVersion:-8.0.0-SNAPSHOT}"
image: "docker.elastic.co/observability-ci/elasticsearch:${stackVersion:-7.11.0-SNAPSHOT}"
ports:
- "9200:9200"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.3'
services:
elastic-agent:
image: docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.0.0-SNAPSHOT}
image: docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.11.0-SNAPSHOT}
container_name: ${elasticAgentContainerName}
depends_on:
elasticsearch:
Expand Down
2 changes: 1 addition & 1 deletion cli/config/compose/services/metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
]
environment:
- BEAT_STRICT_PERMS=${beatStricPerms:-false}
image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-8.0.0-SNAPSHOT}"
image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.11.0-SNAPSHOT}"
labels:
co.elastic.logs/module: "${serviceName}"
volumes:
Expand Down
6 changes: 3 additions & 3 deletions e2e/_suites/fleet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ This is an example of the optional configuration:

```shell
# There should be a Docker image for the runtime dependencies (elasticsearch, kibana, package registry)
export STACK_VERSION=8.0.0-SNAPSHOT
export STACK_VERSION=7.11.0-SNAPSHOT
# (Fleet mode) This environment variable will use a fixed version of the Elastic agent binary, obtained from
# https://artifacts-api.elastic.co/v1/search/8.0.0-SNAPSHOT/elastic-agent
export ELASTIC_AGENT_DOWNLOAD_URL="https://snapshots.elastic.co/8.0.0-59098054/downloads/beats/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-linux-x86_64.tar.gz"
# https://artifacts-api.elastic.co/v1/search/7.11.0-SNAPSHOT/elastic-agent
export ELASTIC_AGENT_DOWNLOAD_URL="https://snapshots.elastic.co/7.11.0-326bd5a6/downloads/beats/elastic-agent/elastic-agent-7.11.0-SNAPSHOT-linux-x86_64.tar.gz"
# (Fleet mode) This environment variable will use the snapshots produced by Beats CI. If the above variable
# is set, this variable will take no effect
export BEATS_USE_CI_SNAPSHOTS="true"
Expand Down
2 changes: 1 addition & 1 deletion e2e/_suites/fleet/ingest-manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const ElasticAgentServiceName = "elastic-agent"
// FleetProfileName the name of the profile to run the runtime, backend services
const FleetProfileName = "fleet"

var agentVersionBase = "8.0.0-SNAPSHOT"
var agentVersionBase = "7.11.0-SNAPSHOT"

// agentVersion is the version of the agent to use
// It can be overriden by ELASTIC_AGENT_VERSION env var
Expand Down
6 changes: 3 additions & 3 deletions e2e/_suites/fleet/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ func downloadAgentBinary(artifact string, version string, OS string, arch string
object := fmt.Sprintf("snapshots/%s", fileName)

// we are setting a version from a pull request: the version of the artifact will be kept as the base one
// i.e. /pull-requests/pr-21100/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-x86_64.rpm
// i.e. /pull-requests/pr-21100/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-amd64.deb
// i.e. /pull-requests/pr-21100/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
// i.e. /pull-requests/pr-21100/elastic-agent/elastic-agent-7.11.0-SNAPSHOT-x86_64.rpm
// i.e. /pull-requests/pr-21100/elastic-agent/elastic-agent-7.11.0-SNAPSHOT-amd64.deb
// i.e. /pull-requests/pr-21100/elastic-agent/elastic-agent-7.11.0-SNAPSHOT-linux-x86_64.tar.gz
if strings.HasPrefix(strings.ToLower(version), "pr-") {
fileName = fmt.Sprintf("%s-%s-%s.%s", artifact, agentVersionBase, arch, extension)
if extension == "tar.gz" {
Expand Down
4 changes: 2 additions & 2 deletions e2e/_suites/metricbeat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ This is an example of the optional configuration:

```shell
# There should be a Docker image for the runtime dependencies (elasticsearch, kibana, package registry)
export STACK_VERSION="8.0.0-SNAPSHOT"
export METRICBEAT_VERSION="8.0.0-SNAPSHOT"
export STACK_VERSION="7.11.0-SNAPSHOT"
export METRICBEAT_VERSION="7.11.0-SNAPSHOT"
# or
# This environment variable will use the snapshots produced by Beats CI
export BEATS_USE_CI_SNAPSHOTS="true"
Expand Down
2 changes: 1 addition & 1 deletion e2e/_suites/metricbeat/metricbeat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
// It can be overriden by the DEVELOPER_MODE env var
var developerMode = false

const metricbeatVersionBase = "8.0.0-SNAPSHOT"
const metricbeatVersionBase = "7.11.0-SNAPSHOT"

// metricbeatVersion is the version of the metricbeat to use
// It can be overriden by METRICBEAT_VERSION env var
Expand Down
14 changes: 7 additions & 7 deletions e2e/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func GetExponentialBackOff(elapsedTime time.Duration) *backoff.ExponentialBackOf
// GetElasticArtifactVersion returns the current version:
// 1. Elastic's artifact repository, building the JSON path query based
// If the version is a PR, then it will return the version without checking the artifacts API
// i.e. GetElasticArtifactVersion("8.0.0-SNAPSHOT")
// i.e. GetElasticArtifactVersion("7.11.0-SNAPSHOT")
// i.e. GetElasticArtifactVersion("pr-22000")
func GetElasticArtifactVersion(version string) string {
if strings.HasPrefix(strings.ToLower(version), "pr-") {
Expand Down Expand Up @@ -132,9 +132,9 @@ func GetElasticArtifactVersion(version string) string {
// on the desired OS, architecture and file extension:
// 1. Observability CI Storage bucket
// 2. Elastic's artifact repository, building the JSON path query based
// i.e. GetElasticArtifactURL("elastic-agent", "8.0.0-SNAPSHOT", "linux", "x86_64", "tar.gz")
// i.e. GetElasticArtifactURL("elastic-agent", "8.0.0-SNAPSHOT", "x86_64", "rpm")
// i.e. GetElasticArtifactURL("elastic-agent", "8.0.0-SNAPSHOT", "amd64", "deb")
// i.e. GetElasticArtifactURL("elastic-agent", "7.11.0-SNAPSHOT", "linux", "x86_64", "tar.gz")
// i.e. GetElasticArtifactURL("elastic-agent", "7.11.0-SNAPSHOT", "x86_64", "rpm")
// i.e. GetElasticArtifactURL("elastic-agent", "7.11.0-SNAPSHOT", "amd64", "deb")
func GetElasticArtifactURL(artifact string, version string, operativeSystem string, arch string, extension string) (string, error) {
exp := GetExponentialBackOff(time.Minute)

Expand Down Expand Up @@ -193,11 +193,11 @@ func GetElasticArtifactURL(artifact string, version string, operativeSystem stri
return "", err
}

// elastic-agent-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
// elastic-agent-7.11.0-SNAPSHOT-linux-x86_64.tar.gz
artifactPath := fmt.Sprintf("%s-%s-%s-%s.%s", artifact, version, operativeSystem, arch, extension)
if extension == "deb" || extension == "rpm" {
// elastic-agent-8.0.0-SNAPSHOT-x86_64.rpm
// elastic-agent-8.0.0-SNAPSHOT-amd64.deb
// elastic-agent-7.11.0-SNAPSHOT-x86_64.rpm
// elastic-agent-7.11.0-SNAPSHOT-amd64.deb
artifactPath = fmt.Sprintf("%s-%s-%s.%s", artifact, version, arch, extension)
}

Expand Down

0 comments on commit 5bace2a

Please sign in to comment.