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

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

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

script/ci/cloudbuild-pg10.yaml

@@ -1,67 +0,0 @@
-steps:
-
-# Decrypt github key
-- name: gcr.io/cloud-builders/gcloud
-  args:
-  - kms
-  - decrypt
-  - --ciphertext-file=script/ci/.gh_helper.enc
-  - --plaintext-file=/root/.ssh/id_rsa
-  - --location=global
-  - --keyring=keyring-github-ci
-  - --key=github-key
-  volumes:
-  - name: 'ssh'
-    path: /root/.ssh
-
-# Set up git with key and domain
-- name: 'gcr.io/cloud-builders/git'
-  entrypoint: 'bash'
-  args:
-  - '-c'
-  - |
-    chmod 600 /root/.ssh/id_rsa
-    cat <<EOF >/root/.ssh/config
-    Hostname github.com
-    IdentityFile /root/.ssh/id_rsa
-    EOF
-    mv script/ci/known_hosts /root/.ssh/known_hosts
-  volumes:
-  - name: 'ssh'
-    path: /root/.ssh
-
-# Clean working directory
-- name: alpine
-  args: ['sh', '-c', 'rm -rf .* | true && rm -rf *']
-
-# Checkout repo with submodules
-- name: 'gcr.io/cloud-builders/git'
-  entrypoint: 'sh'
-  args: ['-c', 'git clone git@github.com:CartoDB/cartodb.git -b "${BRANCH_NAME}" --depth 1 --recursive .']
-  volumes:
-  - name: 'ssh'
-    path: /root/.ssh
-
-# Checkout ci-tools
-- name: 'gcr.io/cloud-builders/git'
-  args:
-  - clone
-  - git@github.com:CartoDB/ci-tools.git
-  volumes:
-  - name: 'ssh'
-    path: /root/.ssh
-
-- name: ubuntu
-  args: ['bash', '-c', '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-pg10.yml', 'up', '--build', '-d']
-  timeout: 900s
-
-- name: gcr.io/cloud-builders/docker
-  args: ['exec', '-i', 'builder_1', '/cartodb/runParallelTests.sh']
-  timeout: 2700s
-
-options:
-    machineType: 'N1_HIGHCPU_32'
-timeout: 3600s

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']

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']