Commit 9e0ec912 authored by Clement Bois's avatar Clement Bois
Browse files

fix(rollback): manifestfile in pre_push

parent 1d8aaf82

templates/gitlab-ci-cf.yml

+10 −9
Original line number Diff line number Diff line
@@ -480,6 +480,15 @@ stages: 
      appname="$6"

    fi



    # find manifest

    manifestfile=$(ls -1 "$CF_SCRIPTS_DIR/${CF_MANIFEST_BASENAME}-${env}.yml" 2>/dev/null || ls -1 "$CF_SCRIPTS_DIR/${CF_MANIFEST_BASENAME}.yml" 2>/dev/null || echo "")

    if [[ -z "$manifestfile" ]]

    then

      log_error "Manifest not found, lookedup paths are:\n - \\e[33;1m$CF_SCRIPTS_DIR/${CF_MANIFEST_BASENAME}-${env}.yml\\e[0m\n - \\e[33;1m$CF_SCRIPTS_DIR/${CF_MANIFEST_BASENAME}.yml\\e[0m"

      exit 1

    fi

    export manifestfile



    log_info "--- \\e[32mdeploy\\e[0m (env: \\e[33;1m${env}\\e[0m)"

    log_info "--- looking for CF scripts in directory: \\e[33;1m${CF_SCRIPTS_DIR}\\e[0m"
@@ -489,15 +498,7 @@ stages: 
    export targetvarfile="$CF_SCRIPTS_DIR/generated-vars.yml"

    generate_vars_file



    # find manifest

    manifestfile=$(ls -1 "$CF_SCRIPTS_DIR/${CF_MANIFEST_BASENAME}-${env}.yml" 2>/dev/null || ls -1 "$CF_SCRIPTS_DIR/${CF_MANIFEST_BASENAME}.yml" 2>/dev/null || echo "")

    export manifestfile

    if [[ -z "$manifestfile" ]]

    then

      log_info "Manifest not found, lookedup paths are:\n - \\e[33;1m$CF_SCRIPTS_DIR/${CF_MANIFEST_BASENAME}-${env}.yml\\e[0m\n - \\e[33;1m$CF_SCRIPTS_DIR/${CF_MANIFEST_BASENAME}.yml\\e[0m\n - no app to deploy"

    else

    push_application

    fi



    check_readiness