summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/00-maasdeploy.sh4
-rwxr-xr-xci/deploy.sh3
2 files changed, 7 insertions, 0 deletions
diff --git a/ci/00-maasdeploy.sh b/ci/00-maasdeploy.sh
index 0dfff050..e3490c2f 100755
--- a/ci/00-maasdeploy.sh
+++ b/ci/00-maasdeploy.sh
@@ -158,6 +158,10 @@ if [ -e ./deployconfig.yaml ]; then
cp ./labconfig.yaml ~/.juju/
fi
+if [ -e ./deployment.yaml ]; then
+ cp ./deployment.yaml ~/.juju/
+fi
+
#
# MAAS Customization
#
diff --git a/ci/deploy.sh b/ci/deploy.sh
index dbe0ef97..3b5e5002 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -110,6 +110,9 @@ deploy() {
if [ ! -f ./environments.yaml ] && [ -e ~/.juju/environments.yaml ]; then
cp ~/.juju/environments.yaml ./environments.yaml
fi
+ if [ ! -f ./deployment.yaml ] && [ -e ~/.juju/deployment.yaml ]; then
+ cp ~/.juju/deployment.yaml ./deployment.yaml
+ fi
if [ ! -f ./labconfig.yaml ] && [ -e ~/.juju/labconfig.yaml ]; then
cp ~/.juju/labconfig.yaml ./labconfig.yaml
fi