Commit f979fd4a authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'master' into 'master' 

fix(lint): move .netrc install so it can be used for ansible-lint job too

See merge request to-be-continuous/ansible!69
parents 47a01979 c7906e64

templates/gitlab-ci-ansible.yml

+6 −7
Original line number Diff line number Diff line
@@ -526,6 +526,12 @@ stages: 
  }



  function maybe_install_requirements() {

    # maybe install .netrc

    if [[ -f ".netrc" ]]; then

      log_info "--- \\e[32m.netrc\\e[0m file found: envsubst and install"

      awkenvsubst < .netrc > ~/.netrc

      chmod 0600 ~/.netrc

    fi

    if [ -f "$ANSIBLE_REQUIREMENTS_FILE" ]

    then

      log_info "--- \\e[32mrequirements\\e[0m file (\\e[33;1m${ANSIBLE_REQUIREMENTS_FILE}\\e[0m) found: running \\e[33;1mansible-galaxy install\\e[0m"
@@ -574,13 +580,6 @@ stages: 
      log_info "--- \\e[32mpre-ansible-playbook\\e[0m hook (\\e[33;1m${prescript}\\e[0m) not found: skip"

    fi



    # maybe install .netrc

    if [[ -f ".netrc" ]]; then

      log_info "--- \\e[32m.netrc\\e[0m file found: envsubst and install"

      awkenvsubst < .netrc > ~/.netrc

      chmod 0600 ~/.netrc

    fi



    maybe_install_requirements



    # extra var environment_type & environment_name