diff options
| -rw-r--r-- | jjb/yaml/deploy-dev-env.yaml | 7 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/deploy-dev-env.sh | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/jjb/yaml/deploy-dev-env.yaml b/jjb/yaml/deploy-dev-env.yaml index 3b7d40a..9c6d704 100644 --- a/jjb/yaml/deploy-dev-env.yaml +++ b/jjb/yaml/deploy-dev-env.yaml @@ -26,9 +26,4 @@ - master builders: - shell: | - cd /var/lib/jenkins/workspace/deploy-dev-env/conf - cp -v /var/lib/jenkins/env.yaml.openbook . - rm -f env.yaml - ln -s env.yaml.openbook env.yaml - cd /var/lib/jenkins/workspace/deploy-dev-env - ansible-playbook -i inventory_json.rb openbook_installer.yaml + ./deploy-dev-env.sh diff --git a/salt/openbook/ansible/files/deploy-dev-env.sh b/salt/openbook/ansible/files/deploy-dev-env.sh index 30c0efe..c5a4e37 100644 --- a/salt/openbook/ansible/files/deploy-dev-env.sh +++ b/salt/openbook/ansible/files/deploy-dev-env.sh @@ -7,4 +7,6 @@ cp -v /var/lib/jenkins//env.yaml.openbook . rm -f env.yaml ln -s env.yaml.openbook env.yaml popd +pushd ${buildroot} ansible-playbook -i inventory_json.rb openbook_installer.yaml +popd |