launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-signing:publish-tarball-job-config into lp-signing:master.

Commit message:
Read Swift configuration for publish-tarball

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-signing/+git/lp-signing/+merge/381515
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-signing:publish-tarball-job-config into lp-signing:master.

diff --git a/Makefile b/Makefile
index f7eb6cb..ea4080d 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ build-tarball:
 		./
 
 publish-tarball: build-tarball
+	[ ! -e ~/.config/swift/lp-signing ] || . ~/.config/swift/lp-signing; \
 	./publish-to-swift \
 		$(SWIFT_CONTAINER_NAME) $(SWIFT_OBJECT_PATH) \
 		$(TARBALL_BUILD_PATH)
diff --git a/ols-vms.conf b/ols-vms.conf
index 9f6b8ac..2c8fd82 100644
--- a/ols-vms.conf
+++ b/ols-vms.conf
@@ -8,3 +8,4 @@ vm.packages = @dependencies.txt, @dependencies-devel.txt, @charm/packages.txt
 [lp-signing]
 vm.class = lxd
 vm.update = True
+jenkaas.secrets = swift/lp-signing:.config/swift/lp-signing