Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ingest Manager] Update package registry docker image for CI. #70716

Merged
merged 4 commits into from
Jul 6, 2020
Merged

[Ingest Manager] Update package registry docker image for CI. #70716

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1dee045
Update package registry docker image for CI.
skh Jul 3, 2020
df2346e
Adapt to new registry filesystem layout.
skh Jul 3, 2020
31e15b1
Adjust tests to changed registry behavior.
skh Jul 3, 2020
74c1446
Merge branch 'master' into update-registry-in-ci
elasticmachine Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions x-pack/test/ingest_manager_api_integration/apis/file.ts
View file
Open in desktop
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')
jfsiii marked this conversation as resolved.
Show resolved Hide resolved
.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
4 changes: 2 additions & 2 deletions x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml
View file
Open in desktop
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
View file
Open in desktop
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