[Fleet] Update docker image of registry used in integration tests #101911

jfsiii · 2021-06-10T15:04:22Z

Summary

Use a more recent Docker image for package registry used in integration/API tests.
- New image is from Jun-14 old image is from Apr-14

Add support for using a custom Docker registry using FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE env var

e.g. production tag

FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE='docker.elastic.co/package-registry/distribution:production' FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner

or a personal one

FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE='docker.elastic.co/employees/jfsiii/package-registry-distribution:kb90454' FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner

Unit or functional tests were updated or added to match the most common scenarios

jfsiii · 2021-06-15T17:56:30Z

@elasticmachine merge upstream

Version 0.11.0 was only available on snapshot & staging for a short time. It was removed from both of those in May and was never promoted to production https://github.com/elastic/package-storage/pulls?q=is%3Apr+0.11.0+system+is%3Aclosed elastic/package-storage#914 elastic/package-storage#1247 elastic/package-storage#1248

x-pack/test/fleet_api_integration/config.ts

Chose a recent one from https://container-library.elastic.co/r/package-registry/distribution. I'm not sure if it's the latest

jfsiii · 2021-06-17T13:18:17Z

@elasticmachine merge upstream

elasticmachine · 2021-06-17T13:27:19Z

Pinging @elastic/fleet (Team:Fleet)

x-pack/test/fleet_api_integration/config.ts

jfsiii · 2021-06-17T13:40:59Z

@ruflin @jen-huang I updated this PR to include a change ae88300 which allows people to override the default image with a specific one using an env variable

I can drop it and move to a separate PR if you would like to discuss it, but I added it here to make things faster if it's a 👍🏻

jen-huang

Love the env var enhancement. 🚀 on happy CI

jen-huang · 2021-06-17T14:33:48Z

x-pack/test/fleet_api_integration/config.ts

@@ -15,7 +15,8 @@ import { defineDockerServersConfig } from '@kbn/test';
 // example: https://beats-ci.elastic.co/blue/organizations/jenkins/Ingest-manager%2Fpackage-storage/detail/snapshot/74/pipeline/257#step-302-log-1.
 // It should be updated any time there is a new Docker image published for the Snapshot Distribution of the Package Registry.
 export const dockerImage =
-  'docker.elastic.co/package-registry/distribution:b6a53ac9300333a4a45f3f7d350c9aed72061a66';
+  process.env.FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE ||


could you document this in our README? https://github.com/elastic/kibana/blob/master/x-pack/plugins/fleet/README.md#api-integration-tests

Added in 527fdef

kibanamachine · 2021-06-17T18:24:40Z

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

💚 Build #132053 succeeded ae88300
💚 Build #131479 succeeded a083d25
💔 Build #131476 failed f3f7b2a
💔 Build #130512 failed d471ab3

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @jfsiii

…astic#101911) ## Summary * Use a more recent Docker image for package registry used in integration/API tests. * [New image](https://container-library.elastic.co/r/package-registry/distribution:fc104ac437370d80518e24da6d0b84370edf0c0c) is from Jun-14 [old image](https://container-library.elastic.co/r/package-registry/distribution:b6a53ac9300333a4a45f3f7d350c9aed72061a66) is from Apr-14 * Add support for using a custom Docker registry using `FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE` env var * e.g. `production` tag ``` FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE='docker.elastic.co/package-registry/distribution:production' FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner ``` or a personal one ``` FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE='docker.elastic.co/employees/jfsiii/package-registry-distribution:kb90454' FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner ``` - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios

kibanamachine · 2021-06-17T19:02:38Z

💚 Backport successful

Status	Branch	Result
✅	7.x

This backport PR will be merged automatically after passing CI.

…01911) (#102560) ## Summary * Use a more recent Docker image for package registry used in integration/API tests. * [New image](https://container-library.elastic.co/r/package-registry/distribution:fc104ac437370d80518e24da6d0b84370edf0c0c) is from Jun-14 [old image](https://container-library.elastic.co/r/package-registry/distribution:b6a53ac9300333a4a45f3f7d350c9aed72061a66) is from Apr-14 * Add support for using a custom Docker registry using `FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE` env var * e.g. `production` tag ``` FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE='docker.elastic.co/package-registry/distribution:production' FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner ``` or a personal one ``` FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE='docker.elastic.co/employees/jfsiii/package-registry-distribution:kb90454' FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner ``` - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios Co-authored-by: John Schulz <john.schulz@elastic.co>

ruflin · 2021-06-18T06:26:38Z

Being able to use an environment variable to change the version of the registry is great! Thanks.

…ets-tab * 'master' of github.com:elastic/kibana: (93 commits) [ML] Remove blank job definition as it is unused and out-of-sync with Elasticsearch (elastic#102506) [Lens] Fix wrong error detection on transition to Top values operation (elastic#102384) [ML] Anomaly detection job custom_settings improvements (elastic#102099) [Cases] Route: Get all alerts attach to a case (elastic#101878) Fixes wrong list exception type when creating endpoint event filters list (elastic#102522) remove search bar that's not working yet (elastic#102550) Migrated Ingest Node Pipeline Functional Tests to use test_user (elastic#102409) [Maps] clean up feature editing name space to avoid conflicts with layer settings editing (elastic#102516) [canvas] Refactor Storybook from bespoke to standard configuration (elastic#101962) [Security Solution] adds wrapSequences method (RAC) (elastic#102106) [FTR] Stabilize SSLP functional tests (elastic#102553) [K8] Added `Inter` font files for new theme (elastic#102359) [Workplace Search] Convert Groups pages to new page template (elastic#102449) [DOC] Add experimental disclaimer to rollup jobs (elastic#95624) [Security Solution][Endpoint] Suppress some of the jest console.error noise created by endpoint list middelware (elastic#102535) [Fleet] Improve performance of Fleet setup (elastic#102219) [Alerting] Add event log entry when a rule starts executing (elastic#102001) [Fleet] Update docker image of registry used in integration tests (elastic#101911) [Asset Management] Osquery telemetry updates (elastic#100754) Converts saved object tagging to new management layout (elastic#102284) ... # Conflicts: # x-pack/plugins/fleet/kibana.json

Use registry w/staging tag, not SHA, for tests

d471ab3

jfsiii mentioned this pull request Jun 15, 2021

[Fleet] Support user overrides in composable templates #101769

Merged

2 tasks

kibanamachine and others added 2 commits June 15, 2021 13:56

Merge branch 'master' into use-staging-registry

f3f7b2a

ruflin reviewed Jun 15, 2021

View reviewed changes

x-pack/test/fleet_api_integration/config.ts Outdated Show resolved Hide resolved

jen-huang mentioned this pull request Jun 16, 2021

[Detections] Adds automatic updating for Prebuilt Security Detection Rules package #101846

Merged

2 tasks

jfsiii commented Jun 17, 2021

View reviewed changes

x-pack/test/fleet_api_integration/config.ts Outdated Show resolved Hide resolved

Revert to a fixed sha but use a newer version

32a130c

Chose a recent one from https://container-library.elastic.co/r/package-registry/distribution. I'm not sure if it's the latest

Merge branch 'master' into use-staging-registry

5f6ff4e

jfsiii marked this pull request as ready for review June 17, 2021 13:22

jfsiii changed the title ~~[Fleet] Use registry w/staging tag, not SHA, for tests~~ [Fleet] Update docker image of registry used in integration tests Jun 17, 2021

botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Jun 17, 2021

jfsiii self-assigned this Jun 17, 2021

jfsiii added v7.14.0 v8.0.0 release_note:skip Skip the PR/issue when compiling release notes labels Jun 17, 2021

jfsiii commented Jun 17, 2021

View reviewed changes

x-pack/test/fleet_api_integration/config.ts Outdated Show resolved Hide resolved

Support FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE env var

ae88300

jfsiii requested review from ruflin and jen-huang June 17, 2021 13:41

jen-huang approved these changes Jun 17, 2021

View reviewed changes

jen-huang reviewed Jun 17, 2021

View reviewed changes

Document FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE var

527fdef

jfsiii requested a review from a team as a code owner June 17, 2021 16:23

jen-huang approved these changes Jun 17, 2021

View reviewed changes

jfsiii merged commit db34f0c into elastic:master Jun 17, 2021

jen-huang added the auto-backport Deprecated - use backport:version if exact versions are needed label Jun 17, 2021

kibanamachine mentioned this pull request Jun 17, 2021

[7.x] [Fleet] Update docker image of registry used in integration tests (#101911) #102560

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Fleet] Update docker image of registry used in integration tests #101911

[Fleet] Update docker image of registry used in integration tests #101911

jfsiii commented Jun 10, 2021 •

edited

Loading

jfsiii commented Jun 15, 2021

jfsiii commented Jun 17, 2021

elasticmachine commented Jun 17, 2021

jfsiii commented Jun 17, 2021

jen-huang left a comment

jen-huang Jun 17, 2021

jfsiii Jun 17, 2021

kibanamachine commented Jun 17, 2021

kibanamachine commented Jun 17, 2021

ruflin commented Jun 18, 2021

[Fleet] Update docker image of registry used in integration tests #101911

[Fleet] Update docker image of registry used in integration tests #101911

Conversation

jfsiii commented Jun 10, 2021 • edited Loading

Summary

jfsiii commented Jun 15, 2021

jfsiii commented Jun 17, 2021

elasticmachine commented Jun 17, 2021

jfsiii commented Jun 17, 2021

jen-huang left a comment

Choose a reason for hiding this comment

jen-huang Jun 17, 2021

Choose a reason for hiding this comment

jfsiii Jun 17, 2021

Choose a reason for hiding this comment

kibanamachine commented Jun 17, 2021

💚 Build Succeeded

Metrics [docs]

History

kibanamachine commented Jun 17, 2021

💚 Backport successful

ruflin commented Jun 18, 2021

jfsiii commented Jun 10, 2021 •

edited

Loading