From f3ba2f526b1927ed20a06cfb733fef1cee27cb28 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 21 Mar 2020 00:18:13 -0400 Subject: [PATCH] 0.1.0-DEV-20200321-001717 ------------------------- * REMOVE: - removed manual cloning of ssl certs - ansible role is maanging ssl cert deployment * ADD: - added support for concurrent job running for check versions and lint play/role --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 758c8c8..852c7af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,7 @@ variables: stages: - - check_versions - - lint_playbook + - check_and_lint - test_deploy @@ -38,7 +37,7 @@ stages: .check_version_template: &check_version_template <<: *tags_template - stage: check_versions + stage: check_and_lint script: - /bin/hostname - chmod 755 ${ANSIBLE_PLAY_PATH} @@ -49,7 +48,7 @@ stages: .lint_playbook_template: &lint_playbook_template <<: *tags_template - stage: lint_playbook + stage: check_and_lint script: - chmod 755 ${ANSIBLE_PLAY_PATH} - ansible-lint -v ${ANSIBLE_PLAY_PATH}/*.yml @@ -64,7 +63,6 @@ stages: - ls -ltr - ansible-galaxy install -r roles/requirements.yml - ansible-playbook -v -i '127.0.0.1,' --connection=local ${ANSIBLE_EXTRA_VARS} ${ANSIBLE_PLAY} - - git clone git@gitlab.thezengarden.net:zen/le-ssl-certs.git /etc/nginx/ssl - /bin/ls -l /etc/nginx/conf.d - /bin/ls -l /etc/nginx/ssl/* - /usr/sbin/nginx -c /etc/nginx/nginx.conf -t