From 0cf809a3c3f9d65dd3db34187f2927350eb1751d Mon Sep 17 00:00:00 2001
From: Felippe Burk <fburk@saltstack.com>
Date: Wed, 8 Apr 2020 23:25:06 -0600
Subject: [PATCH] adding saltstack-internal tag to get perms right

---
 .gitlab-ci.yml          | 18 +++++++++++++++---
 .pre-commit-config.yaml |  6 ++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65d29387224..12741f9cc50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,17 @@
 ---
 stages:
-  - lint
+  - pre-commit
   - test
 
+include:
+  - project: 'saltstack/pop/cicd/ci-templates'
+    file: '/lint/pre-commit-run-all.yml'
+
 lint-salt-full:
   image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest
-  stage: lint
+  stage: pre-commit
+  tags:
+    - saltstack-internal
   cache:
     key: nox-lint-cache
     paths:
@@ -25,7 +31,9 @@ lint-salt-full:
 
 lint-tests-full:
   image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest
-  stage: lint
+  stage: pre-commit
+  tags:
+    - saltstack-internal
   cache:
     key: nox-lint-cache
     paths:
@@ -46,6 +54,8 @@ lint-tests-full:
 docs-build-html:
   image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest
   stage: test
+  tags:
+    - saltstack-internal
   cache:
     key: nox-docs-cache
     paths:
@@ -61,6 +71,8 @@ docs-build-html:
 docs-build-man-pages:
   image: registry.gitlab.com/saltstack/pop/cicd/containers/ubuntu1804:latest
   stage: test
+  tags:
+    - saltstack-internal
   cache:
     key: nox-docs-cache
     paths:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b0eb038330a..db86537ce09 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -106,7 +106,6 @@ repos:
           - --py-version=3.5
           - --platform=linux
 
-
       - id: pip-tools-compile
         alias: compile-linux-py3.6-zmq-requirements
         name: Linux Py3.6 ZeroMQ Requirements
@@ -206,7 +205,6 @@ repos:
           - --py-version=3.6
           - --platform=linux
 
-
       - id: pip-tools-compile
         alias: compile-linux-py3.7-zmq-requirements
         name: Linux Py3.7 ZeroMQ Requirements
@@ -307,7 +305,7 @@ repos:
           - --platform=linux
 
   - repo: https://github.com/timothycrosley/isort
-    rev: '1e78a9acf3110e1f9721feb591f89a451fc9876a'
+    rev: "1e78a9acf3110e1f9721feb591f89a451fc9876a"
     hooks:
       - id: isort
         additional_dependencies: ['toml']
@@ -321,7 +319,7 @@ repos:
             )$
 
   - repo: https://github.com/psf/black
-    rev: stable
+    rev: 19.10b0
     hooks:
       - id: black
         # This tells pre-commit not to pass files to black.