Commit b38e6e4e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige bug de naming, simplifica jobs de backup

See merge request redmic-project/gitlab-ci-templates!69
parents f4982d7f 5eb5521f

_deployment-external-service.yml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
        for deployFile in ${EXTERNAL_SERVICE_DEPLOY_FILES};

        do

          wgetUrl="$(echo ${urlBase})/$(echo ${deployFile} | sed 's/\//%2F/g')/raw?ref=${EXTERNAL_SERVICE_REPOSITORY_BRANCH}";

          wgetOutput="$(echo ${deployFile} | rev | cut -d '/' -f1 | rev)";

          wgetOut="$(echo ${deployFile} | rev | cut -d '/' -f1 | rev)";

          if ! getFile "$(echo ${wgetUrl})" "$(echo ${wgetOut})";

          then

            exit 1;

deployment-external-backup-postgresql.yml

+2 −12
Original line number Diff line number Diff line 
include:

  - local: '/_deployment-external-service.yml'



.deploy-backup-postgresql:

  variables: &deploy-backup-postgresql-variables

.deploy-external-service:

  variables:

    EXTERNAL_SERVICE_PROJECT_ID: 7278179



.deploy-backup-postgresql-development:
@@ -15,35 +15,25 @@ include: 


deploy-backup-postgresql-support-branch-development:

  extends: .deploy-external-service-support-branch-development

  variables:

    <<: *deploy-backup-postgresql-variables

  environment:

    <<: *deploy-backup-postgresql-development-environment



deploy-backup-postgresql-stable-branch-development:

  extends: .deploy-external-service-stable-branch-development

  variables:

    <<: *deploy-backup-postgresql-variables

  environment:

    <<: *deploy-backup-postgresql-development-environment



deploy-backup-postgresql-stable-branch-production:

  extends: .deploy-external-service-stable-branch-production

  variables:

    <<: *deploy-backup-postgresql-variables

  environment:

    <<: *deploy-backup-postgresql-production-environment



deploy-backup-postgresql-tag-development:

  extends: .deploy-external-service-tag-development

  variables:

    <<: *deploy-backup-postgresql-variables

  environment:

    <<: *deploy-backup-postgresql-development-environment



deploy-backup-postgresql-tag-production:

  extends: .deploy-external-service-tag-production

  variables:

    <<: *deploy-backup-postgresql-variables

  environment:

    <<: *deploy-backup-postgresql-production-environment