Skip to content

Commit

Permalink
[Ingest Manager] Update package registry docker image for CI. (#70716) (
Browse files Browse the repository at this point in the history
#70836)

* Update package registry docker image for CI.

* Adapt to new registry filesystem layout.

* Adjust tests to changed registry behavior.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
  • Loading branch information
skh and elasticmachine authored Jul 6, 2020
1 parent 5dab4bc commit dc80d05
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
6 changes: 3 additions & 3 deletions x-pack/test/ingest_manager_api_integration/apis/file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function ({ getService }: FtrProviderContext) {
'/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/visualization/sample_visualization.json'
)
.set('kbn-xsrf', 'xxx')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect(200);
} else {
warnAndSkipTest(this, log);
Expand All @@ -61,7 +61,7 @@ export default function ({ getService }: FtrProviderContext) {
'/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/dashboard/sample_dashboard.json'
)
.set('kbn-xsrf', 'xxx')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect(200);
} else {
warnAndSkipTest(this, log);
Expand All @@ -73,7 +73,7 @@ export default function ({ getService }: FtrProviderContext) {
await supertest
.get('/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/search/sample_search.json')
.set('kbn-xsrf', 'xxx')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect(200);
} else {
warnAndSkipTest(this, log);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package_paths:
- /registry/packages/package-storage
- /registry/packages/test-packages
- /packages/production
- /packages/test-packages
10 changes: 7 additions & 3 deletions x-pack/test/ingest_manager_api_integration/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,25 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
`${path.join(
path.dirname(__filename),
'./apis/fixtures/package_registry_config.yml'
)}:/registry/config.yml`,
)}:/package-registry/config.yml`,
'-v',
`${path.join(
path.dirname(__filename),
'./apis/fixtures/test_packages'
)}:/registry/packages/test-packages`,
)}:/packages/test-packages`,
];

// Docker image to use for Ingest Manager API integration tests.
const dockerImage =
'docker.elastic.co/package-registry/distribution:184b85f19e8fd14363e36150173d338ff9659f01';

return {
testFiles: [require.resolve('./apis')],
servers: xPackAPITestsConfig.get('servers'),
dockerServers: defineDockerServersConfig({
registry: {
enabled: !!registryPort,
image: 'docker.elastic.co/package-registry/package-registry:kibana-testing-1',
image: dockerImage,
portInContainer: 8080,
port: registryPort,
args: dockerArgs,
Expand Down

0 comments on commit dc80d05

Please sign in to comment.