Merge pull request #16421 from CartoDB/feature/sc-226767/build-dedicated-server-for-telefonica-spain

NEWS.md

@@ -92,6 +92,7 @@ Development
 - Add a check before destroying user tables in order to avoid deleting dependent maps [#16381](https://github.com/CartoDB/cartodb/pull/16381)
 - Fix duplicated attributions in datasets [#16384](https://github.com/CartoDB/cartodb/pull/16384)
 - Moving assets cdn domain from global.ssl.fastly.net to libs.cartocdn.com [#16399](https://github.com/CartoDB/cartodb/pull/16399)
+- Fix error while rolling back a user migration from one cloud to another [#16421](https://github.com/CartoDB/cartodb/pull/16421)
 
 4.45.0 (2021-04-14)
 -------------------

app/models/carto/user_migration_import.rb

@@ -109,6 +109,7 @@ module Carto
         raise e
       rescue StandardError => e
         log.append('=== Error importing metadata. Rollback! ===')
+        log.append(e.backtrace.join("\n"))
         service.rollback_import_from_directory(package.meta_dir)
         raise e
       end

app/services/carto/organization_metadata_export_service.rb

@@ -266,7 +266,7 @@ module Carto
       Carto::RedisExportService.new.remove_redis_from_json_export(File.read(organization_redis_file))
       organization = load_organization_from_directory(meta_path)
 
-      user_list = organization.non_owner_users + [organization.owner]
+      user_list = organization.non_owner_users + [organization.owner].compact
       user_list.map do |user|
         Carto::UserMetadataExportService.new.rollback_import_from_directory("#{meta_path}/user_#{user.id}")
       end

script/ci/cloudbuild-build-pr-branch.yaml

@@ -155,7 +155,7 @@ steps:
       docker build --label="org.opencontainers.image.created=$$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${COMMIT_SHA} -t ${_DOCKER_IMAGE_NAME}-onprem-cron:latest -t ${_DOCKER_IMAGE_NAME}-onprem-cron:${_BRANCH_TAG} -t ${_DOCKER_IMAGE_NAME}-onprem-cron:${SHORT_SHA} -t ${_DOCKER_IMAGE_NAME}-onprem-cron:${_BRANCH_TAG}--${SHORT_SHA}  -f Dockerfile.cron .        
   waitFor: ['build-cartodb-onprem']
 
-timeout: 1800s
+timeout: 2700s
 images:
     - ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG}--${SHORT_SHA} 
     - ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG} 

script/ci/cloudbuild-onprem-dev-tests.yaml

@@ -370,7 +370,7 @@ steps:
         fi
   waitFor: ['upload-logs-onprem']
 
-timeout: 2100s
+timeout: 3600s
 options:
   machineType: 'E2_HIGHCPU_32'
 substitutions: