Commit 5f8cc4b2 authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'trunk' into 'master' 

Trunk

See merge request ansible/ansible!12
parents cc75e46d 726c65e1

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line
@@ -16,15 +16,11 @@ stages: 


#### TEST SECTION

test:

  image: ${DOCKER_IMAGE}

  services:

    - ${DIND_IMAGE}

  extends: .common

  stage: test

  variables:

    GIT_STRATEGY: "none"

  script:

    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY

    - alias drr="docker run --rm -v \${PWD}:\${PWD} -w \${PWD}"

    - drr "${CI_REGISTRY_IMAGE}:temp-${CI_COMMIT_SHORT_SHA}" ansible --version

    - drr "${CI_REGISTRY_IMAGE}:temp-${CI_COMMIT_SHORT_SHA}" ansible -m ping localhost

    - drr "${CI_REGISTRY_IMAGE}:temp-${CI_COMMIT_SHORT_SHA}" ansible-lint --version