From 94ba82b3206eb8aa05691c43983231c25f3bbf92 Mon Sep 17 00:00:00 2001 From: ibrahim menem Date: Thu, 28 May 2020 10:38:17 +0200 Subject: [PATCH] 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 | 1 + ...l.sample.py3 => app_config.yml.sample.py2} | 3 +- script/ci/cloudbuild-pg10.yaml | 67 ------------------- script/ci/cloudbuild-pg11.yaml | 2 +- script/ci/cloudbuild-pg12.yaml | 2 +- 5 files changed, 4 insertions(+), 71 deletions(-) rename config/{app_config.yml.sample.py3 => app_config.yml.sample.py2} (99%) delete mode 100644 script/ci/cloudbuild-pg10.yaml diff --git a/config/app_config.yml.sample b/config/app_config.yml.sample index 49912dc74252..c7278816b856 100644 --- 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 b/config/app_config.yml.sample.py2 similarity index 99% rename from config/app_config.yml.sample.py3 rename to config/app_config.yml.sample.py2 index 63f052a59bf3..49912dc74252 100644 --- a/config/app_config.yml.sample.py3 +++ b/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 deleted file mode 100644 index 77faca16584b..000000000000 --- a/script/ci/cloudbuild-pg10.yaml +++ /dev/null @@ -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 </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 diff --git a/script/ci/cloudbuild-pg11.yaml b/script/ci/cloudbuild-pg11.yaml index f10bca39ba56..c6dc4138e48b 100644 --- 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 index 2c2222465e03..8d3b883d210d 100644 --- 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']