Commit - heroes/salt - 250b0901fd9ae118694e211541976b22dc12e599

    Merge branch 'test_env' into 'production'
    
    use testenv to separate conditions between production and testing
    
    See merge request infra/salt!179

.gitlab-ci.yml

file modified

+2 -2

bin/prepare_test_env.sh

file modified

+5 -7

bin/run_tests_locally.sh

file modified

+1 -1

pillar/role/login.sls

file modified

+2 -0

pillar/role/proxy.sls

file modified

+2 -0

pillar/role/saltmaster.sls

file modified

+2 -0

pillar/role/web_gitlab.sls

file modified

+2 -0

pillar/role/web_mirrors.sls

file modified

+5 -1

pillar/role/worker_gitlab.sls

file modified

+2 -0

heroes / salt

Source Code

250b09 Merge branch 'test_env' into 'production'

Merged and Committed by Theo Chatzimichos 7 years ago

`250b09` Merge branch 'test_env' into 'production'