From 1dee045c9ec8f0579622b776853adcf64cdd7d55 Mon Sep 17 00:00:00 2001
From: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
Date: Fri, 3 Jul 2020 15:43:35 +0200
Subject: [PATCH 1/3] Update package registry docker image for CI.

---
 x-pack/test/ingest_manager_api_integration/config.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/ingest_manager_api_integration/config.ts b/x-pack/test/ingest_manager_api_integration/config.ts
index bbef12463ed0..b91e1a8f3064 100644
--- a/x-pack/test/ingest_manager_api_integration/config.ts
+++ b/x-pack/test/ingest_manager_api_integration/config.ts
@@ -29,13 +29,17 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     )}:/registry/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,

From df2346e6f06b7237dfc1825cf2541726c53eb09f Mon Sep 17 00:00:00 2001
From: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
Date: Fri, 3 Jul 2020 16:25:23 +0200
Subject: [PATCH 2/3] Adapt to new registry filesystem layout.

---
 .../apis/fixtures/package_registry_config.yml                 | 4 ++--
 x-pack/test/ingest_manager_api_integration/config.ts          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml
index 0060e247827d..5bfbf78e25ed 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml
@@ -1,3 +1,3 @@
   package_paths:
-    - /registry/packages/package-storage
-    - /registry/packages/test-packages
\ No newline at end of file
+    - /packages/production
+    - /packages/test-packages
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/config.ts b/x-pack/test/ingest_manager_api_integration/config.ts
index b91e1a8f3064..88ec8d53c1cd 100644
--- a/x-pack/test/ingest_manager_api_integration/config.ts
+++ b/x-pack/test/ingest_manager_api_integration/config.ts
@@ -21,12 +21,12 @@ 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.

From 31e15b127b22de15fd62efb08336f2665a958cf6 Mon Sep 17 00:00:00 2001
From: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
Date: Fri, 3 Jul 2020 16:43:05 +0200
Subject: [PATCH 3/3] Adjust tests to changed registry behavior.

---
 x-pack/test/ingest_manager_api_integration/apis/file.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/test/ingest_manager_api_integration/apis/file.ts b/x-pack/test/ingest_manager_api_integration/apis/file.ts
index 33eeda1ee274..a7462ac51ecc 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/file.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/file.ts
@@ -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);
@@ -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);
@@ -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);