From 2333ec4d1f013845994103ee9faf31df88404d8f Mon Sep 17 00:00:00 2001
From: Brad Beam <brad.beam@b-rad.info>
Date: Tue, 24 Jan 2017 22:44:06 -0600
Subject: [PATCH] Splitting out moderator check from syntax check

- Attempt to clarify CI runs from contributors
---
 .gitlab-ci.yml               |  13 ++++++++++---
 scripts/.premoderator.sh.swp | Bin 0 -> 12288 bytes
 scripts/premoderator.sh      |   5 ++++-
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 scripts/.premoderator.sh.swp

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80ba6816f..d65be3b7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
 stages:
+  - moderator
   - unit-tests
   - deploy-gce-part1
   - deploy-gce-part2
@@ -506,15 +507,21 @@ ubuntu-rkt-sep:
   only: ['master', /^pr-.*$/]
 
 # Premoderated with manual actions
-syntax-check:
+ci-authorized:
   <<: *job
-  stage: unit-tests
+  stage: moderator
   before_script:
     - apt-get -y install jq
   script:
-    - ansible-playbook -i inventory/local-tests.cfg -u root -e ansible_ssh_user=root  -b --become-user=root cluster.yml -vvv  --syntax-check
     - /bin/sh scripts/premoderator.sh
   except: ['triggers', 'master']
+  
+syntax-check:
+  <<: *job
+  stage: unit-tests
+  script:
+    - ansible-playbook -i inventory/local-tests.cfg -u root -e ansible_ssh_user=root  -b --become-user=root cluster.yml -vvv  --syntax-check
+  except: ['triggers', 'master']
 
 tox-inventory-builder:
   stage: unit-tests
diff --git a/scripts/.premoderator.sh.swp b/scripts/.premoderator.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..064764e5b3412a3d438b4daee208264693879c00
GIT binary patch
literal 12288
zcmYc?2=nw+FxN9?U|?VnU|^V@*B-&X|0lz1YX*j-)WqB*kT?PCRFs%ftm~VY?3ACM
zts793ua}dboS1{5s}5|SenC-wR%&udv3_w;vVMAINk(asUUGh}es*b6YEfQlNouif
zW?ph>QesJdk$!e!QF^|9adJ^+K}oTGK~ZXMeoAT)NJ_6b1H*<<fzc2c4FRknP+F3v
zYr)H4Y-DHvl2=wzR1g*l1u;kQXb6mkz-S1JhQMeDjE2By2#kinXb6mkzz7L}k^)AC
zdIkmtCa8afpfn>I4dsqfqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd70w
zFa#1)7#MDFGcefjK<58p{r{)@3=IAJ3=E0<3=9eU3=E9?3=9wX7#JS#F)-}pV_?YP
zV_=ZtV_;ar%fJxI%fRr7hk@ZT4+Fy-9tMUfJPZsId7x$v!7v$h@@NQ*hQMeDjE2By
z2#kinXb6mkz-S1Jh5$+kB$pQDD1Zr-YUj`(pLoY0_uyIurHqo2f?_Lu{ltPyJ*1_*
z`9<l)*w^>wrsgK478UEORF@W~7S$>-q-8R2rdDK@C>SzurY2|PD=38)rxq!s<fj%Z
z<mHzrWF(fQDiov^<z^NaXXfV>E0p9b6qh6xl_)rSDioFGDKTWGDMTwMsesH=Qn0mE
zP|7RK$x%{>wN@y}NX=tVR&dTpP0m(G%P#^6C={g@mSz^ErYL|kD5MwVmlh~MU6qkp
z05U!?CnvvLK?Ce615JheB88OH<ebdBRH&GpfhO3bg3N+ckT8RSLXARJp@Ocjf>Lf`
zfkts^PHJ+AhF(&BN~J=LLUMjyNn&PRv4Td7l8UdRyQg!ElBTAnLXCo6v_Y(b9>^Vf
zIr-_Cc}fa33MEAfx+x0kO6r;nAPHL)4dR2nD77FTN4P`QRc96#m!^UOAIzxLPtMQH
zP0cGQR#J#zP*!kHEdl!rWUoSAVs5HJT2X#3SSTP!0j5@=JhLPNELfhHSCX2dkeisE
znXHhRmz<bal30?NpQn(VSX`2t!T`3!Rz(9Gtt!>dp7Bnho<1(|L9TA`evZDbwF)($
zn9Whp%}Z5K*N-bG($$Db(bm+B3D#E8S5Q+^C@9LzD^XA}RM&($FCa)EuN0JmAWp+D
zl7Rsnz_v;%)nJB|ZgQqVGC2NAGBS&6l^Ecu*H%e4tyn=<H#t8qFEzPDw<I$+HNUh(
z!Bjz4H#e~Y%m;IdQcH>|5kf`=3c9*rF$EJCOE)DoC$Un&REdE>S;4g;v!oajN(MR#
znQ7p#f~6IO%wmP~{QMM9I!n)IP*!kM$V<!wC2{ytcTfmI7QllPK@y{TW=T$B5-7>T
z4a(0`NK_~;NKMX6%S=`X2r5>GMG=FtqJC0lo_=wLf^KSQg@SIr0!UX{VrC8l0L3_g
A<^TWy

literal 0
HcmV?d00001

diff --git a/scripts/premoderator.sh b/scripts/premoderator.sh
index 2e730df7b..4b35af8d2 100644
--- a/scripts/premoderator.sh
+++ b/scripts/premoderator.sh
@@ -11,5 +11,8 @@ issue=$(echo ${CI_BUILD_REF_NAME} | perl -ne '/^pr-(\d+)-\S+$/ && print $1')
 user=$(curl ${CURL_ARGS} "https://api.github.com/repos/kubernetes-incubator/kargo/issues/${issue}/comments" \
   | jq -M "map(select(.body | contains (\"$MAGIC\"))) | .[0] .user.login" | tr -d '"')
 # Check for the required user group membership to allow (exit 0) or decline (exit >0) the pipeline
-[ "$user" != "null" ] || exit 1
+if [ "$user" = "null" ]; then
+	echo "User does not have permissions to start CI run"
+	exit 1
+fi
 curl ${CURL_ARGS} "https://api.github.com/orgs/kubernetes-incubator/members/${user}"
-- 
GitLab