From da7d3dfc7d3bd83e7522175a720b30fee4c9b3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hector@hectorramos.com>
Date: Mon, 13 May 2019 07:31:01 -0700
Subject: [PATCH] Partially back out #24506, fixing iOS e2e tests (#24788)

Summary:
The iOS End-to-End tests started failing with the updates made to the iOS template's Podfile in https://github.com/facebook/react-native/commit/261197d85705dad1a362cc4637aa308c0382dcbe. Undoing these gets our CI iOS e2e test step back to green.

[iOS] [Removed] - Revert auto-linking related changes to the iOS template Podfile
Pull Request resolved: https://github.com/facebook/react-native/pull/24788

Differential Revision: D15317895

Pulled By: cpojer

fbshipit-source-id: a1f3b84b39c6d341740f742d83fd05a1ab841184
---
 .circleci/config.yml | 14 ++++++++++++--
 template/ios/Podfile |  2 --
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21f3b2c91ef..30d1e1d7814 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -499,12 +499,22 @@ jobs:
 
       - run:
           name: Run JavaScript End-to-End Tests
-          command: node ./scripts/run-ci-e2e-tests.js --js --retries 3
+          command: |
+            # free up port 8081 for the packager before running tests
+            set +eo pipefail
+            lsof -i tcp:8081 | awk 'NR!=1 {print $2}' | xargs kill
+            set -eo pipefail
+            node ./scripts/run-ci-e2e-tests.js --js --retries 3
           when: always
 
       - run:
           name: Run iOS End-to-End Tests
-          command: node ./scripts/run-ci-e2e-tests.js --ios --retries 3;
+          command: |
+            # free up port 8081 for the packager before running tests
+            set +eo pipefail
+            lsof -i tcp:8081 | awk 'NR!=1 {print $2}' | xargs kill
+            set -eo pipefail
+            node ./scripts/run-ci-e2e-tests.js --ios --retries 3;
           when: always
 
 
diff --git a/template/ios/Podfile b/template/ios/Podfile
index a25e513a914..b29232faea2 100644
--- a/template/ios/Podfile
+++ b/template/ios/Podfile
@@ -1,5 +1,4 @@
 platform :ios, '9.0'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 target 'HelloWorld' do
   # Pods for HelloWorld
@@ -33,7 +32,6 @@ target 'HelloWorld' do
     # Pods for testing
   end
 
-  use_native_modules!
 end
 
 target 'HelloWorld-tvOS' do