diff options
| -rw-r--r-- | jjb/yaml/deploy-dev-env.yaml | 14 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/deploy-dev-env.sh | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/jjb/yaml/deploy-dev-env.yaml b/jjb/yaml/deploy-dev-env.yaml index 1f2c630..3b7d40a 100644 --- a/jjb/yaml/deploy-dev-env.yaml +++ b/jjb/yaml/deploy-dev-env.yaml @@ -25,10 +25,10 @@ branches: - master builders: - shell: | - ce /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 + - 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 diff --git a/salt/openbook/ansible/files/deploy-dev-env.sh b/salt/openbook/ansible/files/deploy-dev-env.sh index 009a97b..30c0efe 100644 --- a/salt/openbook/ansible/files/deploy-dev-env.sh +++ b/salt/openbook/ansible/files/deploy-dev-env.sh @@ -1,10 +1,10 @@ #!/bin/bash -pushd /var/lib/jenkins/workspace/deploy-dev-env/conf -cp -v /var/lib/jenkins/env.yaml.openbook . +buildroot="$(pwd)" + +pushd ${buildroot}/conf +cp -v /var/lib/jenkins//env.yaml.openbook . rm -f env.yaml ln -s env.yaml.openbook env.yaml popd -pushd /var/lib/jenkins/workspace/deploy-dev-env ansible-playbook -i inventory_json.rb openbook_installer.yaml -popd |