summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-09-20 14:32:48 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-09-20 15:40:33 (GMT)
commit596c726647e7bf8f054229bc1b577c9ed5a839d7 (patch)
treebc55a3f31c5b71407449e726dd64859680c134d9
parentd4b1536cb6810eae9f410740fd470cc372d43d0f (diff)
downloaddefinitions-sam/bst-artifacts-url.tar.gz
project.conf: Set the artifact cache URL heresam/bst-artifacts-url
This is possible since this change: https://gitlab.com/BuildStream/buildstream/commit/00e08459c4 Older versions of BuildStream will fail to parse the project.conf file with this change; I think it's acceptable to force everyone to update as we are still in the development stage of the BuildStream migration. If you want to override the configuration for whatever reason you'll now need to put this in your ~/.config/buildstream.conf file: projects: baserock: artifacts: pull-url: ... push-url: ... If you set a "global" artifacts configuration by doing this... artifacts: pull-url: ... ... it'll be ignored because the project-specific config from this project.conf file will take precedence. Overriding seems to be done for the whole config block, so if you only set push-url in your buildstream.conf file it will be interpreted to mean "set push-url, and unset pull-url" rather than "set push-url and use the existing value of pull-url."
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--project.conf3
2 files changed, 10 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3d7013..80ed243 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,14 +42,16 @@ before_script:
# Trust the host key of the cache server.
- ssh-keyscan -p 22200 ostree.baserock.org >> ~/.ssh/known_hosts
- # Enable push and pull for Baserock artifact cache
+ # Enable push and pull for Baserock artifact cache (default config is pull only)
- |
mkdir -p ~/.config
- echo "artifacts:" > ~/.config/buildstream.conf
- echo " pull-url: https://ostree.baserock.org/cache/" >> ~/.config/buildstream.conf
+ echo "projects:" > ~/.config/buildstream.conf
+ echo " baserock:" > ~/.config/buildstream.conf
+ echo " artifacts:" > ~/.config/buildstream.conf
+ echo " pull-url: https://ostree.baserock.org/cache/" >> ~/.config/buildstream.conf
if [ -n "$baserock_ostree_cache_private_key" ]; then
- echo " push-url: ostree@ostree.baserock.org:cache" >> ~/.config/buildstream.conf
- echo " push-port: 22200" >> ~/.config/buildstream.conf
+ echo " push-url: ostree@ostree.baserock.org:cache" >> ~/.config/buildstream.conf
+ echo " push-port: 22200" >> ~/.config/buildstream.conf
fi
cat ~/.config/buildstream.conf
diff --git a/project.conf b/project.conf
index 83a0907..1802377 100644
--- a/project.conf
+++ b/project.conf
@@ -34,6 +34,9 @@ variables:
%{target-stage1}-strip --remove-section=.comment --remove-section=.note --strip-unneeded "$1"
%{target-stage1}-objcopy --add-gnu-debuglink "$debugfile" "$1"' - {} ';'
+artifacts:
+ pull-url: https://ostree.baserock.org/cache/
+
# Resolve the cpu and ABI portions of the host triple based
# on architecture names.
arches: