Commit 7d69cdbc authored by P. Déchamboux's avatar P. Déchamboux
Browse files

Merge branch 'fix/service-creation' into 'master' 

fix: bug correction in service-creation (pb with command parameters)

See merge request to-be-continuous/cloud-foundry!67
parents 31cb6110 9bc62614

templates/gitlab-ci-cf.yml

+25 −16
Original line number Diff line number Diff line
@@ -813,27 +813,36 @@ stages: 
    sfound=$(cf services | sed -e 1,3d | cut -d " " -f 1 | sed -ne "${tobesearched}")

    if [[ -z "${sfound}" ]]; then

      is_cups "${fvalues[1]}" "${fvalues[2]}"

      argfile=$(mktemp)

      if [[ "$res_is_cups" = "CUPS" ]]; then

        narg="-p"

        argfile=$(mktemp)

        log_info "Create command: cf cups \"${fvalues[0]}\" \"-p ${argfile}\""

        cf cups "${fvalues[0]}" "-p ${argfile}" >/dev/null

        rm -f "${argfile}"

      else

        narg="-c"

      fi

        if [[ -z "${fvalues[3]}" ]]; then

          if [[ -z "${fvalues[4]}" ]]; then

        narg=

            log_info "Create command: cf create-service \"${fvalues[1]}\" \"${fvalues[2]}\" \"${fvalues[0]}\" -w"

            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" -w >/dev/null

          else

            argfile=$(mktemp)

            echo "${fvalues[4]}" >"${argfile}"

            log_info "Create command: cf create-service \"${fvalues[1]}\" \"${fvalues[2]}\" \"${fvalues[0]}\" -c \"${argfile}\" -w"

            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" -c "${argfile}" -w >/dev/null

            rm -f "${argfile}"

          fi

      if [[ "$res_is_cups" = "CUPS" ]]; then

        cf cups "${fvalues[0]}" "${narg}" "${argfile}" >/dev/null

        else

        if [[ -z "${fvalues[3]}" ]]; then

          cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" "${narg}" "${argfile}" -w >/dev/null

          if [[ -z "${fvalues[4]}" ]]; then

            log_info "Create command: cf create-service \"${fvalues[1]}\" \"${fvalues[2]}\" \"${fvalues[0]}\" \"-b ${fvalues[3]}\" -w"

            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" "-b ${fvalues[3]}" -w >/dev/null

          else

          cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" "-b ${fvalues[3]}" "${narg}" "${argfile}" -w >/dev/null

            argfile=$(mktemp)

            echo "${fvalues[4]}" >"${argfile}"

            log_info "Create command: cf create-service \"${fvalues[1]}\" \"${fvalues[2]}\" \"${fvalues[0]}\" \"-b ${fvalues[3]}\" -c \"${argfile}\" -w"

            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" "-b ${fvalues[3]}" -c "${argfile}" -w >/dev/null

            rm -f "${argfile}"

          fi

        fi

      fi

      rm -f "${argfile}"

      log_info "... created"

    else

      log_warn "... service instance \"${fvalues[0]}\" already exist - skipped"
@@ -854,7 +863,7 @@ stages: 
        manage_services_errors=$((manage_services_errors+1))

        return

      fi

      name=$(echo "${desc_field}" | tr -d '\r')

      name=$(echo "${desc_field}" | tr -d '\r' | envsubst)

      log_info "${smsg}service definition OK - proceed"

      log_info "--- cfServiceName: ${name}"

      tobesearched="/^${name}\$/p"