merge.sh

@@ -3,17 +3,17 @@ git fetch --all;
 
 #copy dev to history to ensure we don't lose changes if something goes wrong
 git checkout history;
-git reset --hard qual;
+git reset --hard dev;
 git push --force;
 
 #merge to master
-git checkout -B prod origin/master;
+git checkout -B master origin/master;
-git merge --squash qual;
+git merge --squash dev;
 git commit -am "$cm";
 git push;
 
 #clean dev
-git checkout qual;
+git checkout dev;
-git reset --hard prod;
+git reset --hard master;
 git push --force;
-git reset --hard origin/qual;
+git reset --hard origin/dev;

pillars/roles/git/saltmaster.sls

@@ -6,13 +6,19 @@ branches:
 {%- endfor %}
 
 git:
-{%- for branch in branches %}
+  salt:
-  salt_{{branch}}:
     repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/{{branch}}"
+    path: "/srv/salt/prod"
-    branch: "{{branch}}"
+    branch: "master"
     key: "git_actcur"
-    force: {{ "True" if branch == "prod" else "false" }}
+    force: true
+    email: "actcur@actcur.com"
+    name: "Actaeus Curabitur"
+  salt_dev:
+    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
+    path: "/srv/salt/dev"
+    branch: "dev"
+    key: "git_actcur"
+    force: true
     email: "actcur@actcur.com"
     name: "Actaeus Curabitur"
-{%- endfor %}

states/test

@@ -1,18 +0,0 @@
-{%- set branches=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
-branches:
-  saltmaster:
-{%- for branch in branches %}
-    - {{branch}}
-{%- endfor %}
-
-git:
-{%- for branch in branches %}
-  salt_{{branch}}:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/{{branch}}"
-    branch: "{{branch}}"
-    key: "git_actcur"
-    force: {{ "True" if branch == "prod" else "false" }}
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-{%- endfor %}

states/test.sls

@@ -1,4 +0,0 @@
-/test:
-  file.managed:
-    - source: salt://test
-    - template: jinja