Remove temporal config file since we finished the migration (#15687)

* Remove temporal config file since we finished the migration * We will maintain pg11 tests for some time
CartoDB · May 28, 2020 · 94ba82b · 94ba82b
1 parent 027f4d1
commit 94ba82b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 71 deletions.
diff --git a/config/app_config.yml.sample b/config/app_config.yml.sample
@@ -269,6 +269,7 @@ defaults: &defaults
       region: ''
     uploads_path: 'public/uploads' # including 'uploads' assumes public path. Absolute path example: /tmp/exports/downloads
   importer:
+    python_bin_path: '/usr/bin/python3'
     blacklisted_ip_addr: []
     content_guessing:        # Depends on geocoding
       enabled:         false # Disabled if false or not present

diff --git a/config/app_config.yml.sample.py3 → config/app_config.yml.sample.py2 b/config/app_config.yml.sample.py3 → config/app_config.yml.sample.py2
@@ -268,9 +268,7 @@ defaults: &defaults
       s3_endpoint: ''
       region: ''
     uploads_path: 'public/uploads' # including 'uploads' assumes public path. Absolute path example: /tmp/exports/downloads
-    python_bin_path: '/usr/bin/python3'
   importer:
-    python_bin_path: '/usr/bin/python3'
     blacklisted_ip_addr: []
     content_guessing:        # Depends on geocoding
       enabled:         false # Disabled if false or not present
@@ -781,6 +779,7 @@ defaults: &defaults
       aws_access_key_id: ''
       aws_secret_key: ''
       aws_region: us-east-1
+      server_ca: disabled
     pgproxy:
       host: 'dbconn.carto.com'
       port: 5432

diff --git a/script/ci/cloudbuild-pg10.yaml b/script/ci/cloudbuild-pg10.yaml
diff --git a/script/ci/cloudbuild-pg11.yaml b/script/ci/cloudbuild-pg11.yaml
@@ -65,7 +65,7 @@ steps:
     path: /root/.ssh
 
 - name: ubuntu
-  args: ['bash', '-c', 'rm -rf .git && cp ci-tools/repos/cartodb/* . && cp config/app_config.yml.sample config/app_config.yml && cp config/database.yml.sample config/database.yml && cp lib/assets/javascripts/cdb/secrets.example.json lib/assets/javascripts/cdb/secrets.json && cp script/ci/* .']
+  args: ['bash', '-c', 'rm -rf .git && cp ci-tools/repos/cartodb/* . && cp config/app_config.yml.sample.py2 config/app_config.yml && cp config/database.yml.sample config/database.yml && cp lib/assets/javascripts/cdb/secrets.example.json lib/assets/javascripts/cdb/secrets.json && cp script/ci/* .']
 
 - name: 'docker/compose:1.22.0'
   args: ['-f', 'docker-compose-pg11.yml', 'up', '--build', '-d']

diff --git a/script/ci/cloudbuild-pg12.yaml b/script/ci/cloudbuild-pg12.yaml
@@ -63,7 +63,7 @@ steps:
     path: /root/.ssh
 
 - name: ubuntu
-  args: ['bash', '-c', 'rm -rf .git && cp ci-tools/repos/cartodb/* . && cp config/app_config.yml.sample.py3 config/app_config.yml && cp config/database.yml.sample config/database.yml && cp lib/assets/javascripts/cdb/secrets.example.json lib/assets/javascripts/cdb/secrets.json && cp script/ci/* .']
+  args: ['bash', '-c', 'rm -rf .git && cp ci-tools/repos/cartodb/* . && cp config/app_config.yml.sample config/app_config.yml && cp config/database.yml.sample config/database.yml && cp lib/assets/javascripts/cdb/secrets.example.json lib/assets/javascripts/cdb/secrets.json && cp script/ci/* .']
 
 - name: 'docker/compose:1.22.0'
   args: ['-f', 'docker-compose-pg12.yml', 'up', '--build', '-d']