From 1d147023336aebb9c3120dc96f3fefd3f53320ec Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sun, 1 Aug 2021 12:41:46 -0500
Subject: [PATCH] Use Ansible from Ubuntu repos, unmask error code for pushes

---
 .gitlab-ci.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41b6965..7c5db9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,8 @@ before_script:
   # Get the packages we need
   - apt-get update
   - apt-get install gnupg openssh-client python3-docker python3-pip python-is-python3 wget -y
-  - pip install ansible ansible-lint
+  - apt-get install ansible ansible-lint -y
+  #- pip install ansible ansible-lint
   # Dump our key
   - eval $(ssh-agent -s)
   - echo "$ANSIBLE_SSH_KEY" | tr -d '\r' | ssh-add -
@@ -24,8 +25,8 @@ before_script:
     [ -n "$ZEROTIER_NETWORK_ID" ] && \
     wget -qO - https://raw.githubusercontent.com/zerotier/ZeroTierOne/master/doc/contact%40zerotier.com.gpg | apt-key add - && \
     echo "deb http://download.zerotier.com/debian/buster buster main" >> /etc/apt/sources.list && \
-    apt update && \
-    apt install zerotier-one -y && \
+    apt-get update && \
+    apt-get install zerotier-one -y && \
     service zerotier-one start && \
     sleep 5 && \
     zerotier-cli join "$ZEROTIER_NETWORK_ID" && \
@@ -62,6 +63,9 @@ Play_Against_Desktops:
   stage: play
   script:
     - ansible-playbook -l desktop site.yml --vault-password-file /vaultpw
+    - error="$?"
+    - echo "Return code: $error"
+
 Play_Against_Production:
   stage: play
   script: