Skip to content

Commit 8ed7283

Browse files
authored
[ci] Use daily promoted EPR distribution (#205221)
#199071 introduced a daily pipeline to run acceptance tests against the latest EPR image and to promote the image if successful. This updates our tests to start using the daily promotion except when running the acceptance tests.
1 parent 0b8ae36 commit 8ed7283

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

Diff for: .buildkite/pipeline-resource-definitions/kibana-package-registry.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ spec:
2121
env:
2222
SLACK_NOTIFICATIONS_CHANNEL: "#kibana-operations-alerts"
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
24-
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
24+
REPORT_FAILED_TESTS_TO_GITHUB: "true"
25+
FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE: "docker.elastic.co/package-registry/distribution:lite"
2526
repository: elastic/kibana
2627
branch_configuration: main
2728
default_branch: main

Diff for: x-pack/platform/plugins/shared/fleet/server/integration_tests/helpers/docker_registry_helper.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ import pRetry from 'p-retry';
1818
const BEFORE_SETUP_TIMEOUT = 30 * 60 * 1000; // 30 minutes;
1919

2020
const DOCKER_START_TIMEOUT = 5 * 60 * 1000; // 5 minutes
21-
const DOCKER_IMAGE = `docker.elastic.co/package-registry/distribution:lite`;
21+
// This image comes from the latest successful build of https://buildkite.com/elastic/kibana-package-registry-promote
22+
// which is promoted after acceptance tests succeed against docker.elastic.co/package-registry/distribution:lite
23+
const DOCKER_IMAGE =
24+
process.env.FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE ||
25+
'docker.elastic.co/kibana-ci/package-registry-distribution:lite';
2226

2327
function firstWithTimeout(source$: Rx.Observable<any>, errorMsg: string, ms = 30 * 1000) {
2428
return Rx.race(

Diff for: x-pack/test/fleet_api_integration/config.base.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ import {
1515

1616
const getFullPath = (relativePath: string) => path.join(path.dirname(__filename), relativePath);
1717
// Docker image to use for Fleet API integration tests.
18-
// This hash comes from the latest successful build of the Production Distribution of the Package Registry, for
19-
// example: https://internal-ci.elastic.co/blue/organizations/jenkins/package_storage%2Findexing-job/detail/main/1884/pipeline/147.
20-
// It should be updated any time there is a new package published.
21-
export const dockerImage = 'docker.elastic.co/package-registry/distribution:lite';
18+
// This image comes from the latest successful build of https://buildkite.com/elastic/kibana-package-registry-promote
19+
// which is promoted after acceptance tests succeed against docker.elastic.co/package-registry/distribution:lite
20+
export const dockerImage =
21+
process.env.FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE ||
22+
'docker.elastic.co/kibana-ci/package-registry-distribution:lite';
2223

2324
export const BUNDLED_PACKAGE_DIR = '/tmp/fleet_bundled_packages';
2425

Diff for: x-pack/test/functional/config.base.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import { services } from './services';
1111
import { pageObjects } from './page_objects';
1212

1313
// Docker image to use for Fleet API integration tests.
14-
// This hash comes from the latest successful build of the Production Distribution of the Package Registry, for
15-
// example: https://internal-ci.elastic.co/blue/organizations/jenkins/package_storage%2Findexing-job/detail/main/1884/pipeline/147.
16-
// It should be updated any time there is a new package published.
17-
export const dockerImage = 'docker.elastic.co/package-registry/distribution:lite';
14+
// This image comes from the latest successful build of https://buildkite.com/elastic/kibana-package-registry-promote
15+
// which is promoted after acceptance tests succeed against docker.elastic.co/package-registry/distribution:lite
16+
export const dockerImage =
17+
process.env.FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE ||
18+
'docker.elastic.co/kibana-ci/package-registry-distribution:lite';
1819

1920
// the default export of config files must be a config provider
2021
// that returns an object with the projects config values

0 commit comments

Comments
 (0)