diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63b8c0f94f5016e289b0ce2a5f0a19585bf85d1c..0f8cbaad5c6a7e93f0d84448b74f7d72d72eb8ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,7 +415,7 @@ syntax-check: 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'] + except: ['triggers', 'master'] tox-inventory-builder: stage: unit-tests @@ -424,4 +424,4 @@ tox-inventory-builder: - pip install tox - cd contrib/inventory_builder && tox when: manual - except: ['triggers'] + except: ['triggers', 'master'] diff --git a/scripts/premoderator.sh b/scripts/premoderator.sh index f039205aec00a72676cebc1946af24d757e91394..2e730df7bd4854e74f55babf1ef3ed4aec5bea80 100644 --- a/scripts/premoderator.sh +++ b/scripts/premoderator.sh @@ -11,4 +11,5 @@ 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 curl ${CURL_ARGS} "https://api.github.com/orgs/kubernetes-incubator/members/${user}"