X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=.gitlab-ci.yml;h=4b3e9adb09e15bc542ea374ad78ccbe0c4e96367;hb=6f50da79e825df52cde8d03d32be2da2b6fcf898;hp=49a4eb3e29dc46850500a0e4ac6879839b86b213;hpb=dd7752715ac996b2783727efacf103a96ca43d3e;p=mirror%2Fdsa-puppet.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49a4eb3e2..4b3e9adb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,14 +11,13 @@
     - apt-get install -y cmake libldap-dev libsasl2-dev
     - bundle install --binstubs bin --with octocatalog
 
-    - git branch -f base $REF_BASE
-    - git branch -f test $CI_BUILD_REF
-
-    - echo -n "$R10K" > r10k.yaml
-    - bundle exec r10k deploy environment --verbose debug base test
+    - echo -n "$FILE_R10K" > r10k.yaml
+    - git branch -f $ENV_BASE origin/$ENV_BASE
+    - git branch -f $ENV_TEST $CI_BUILD_REF
+    - bundle exec r10k deploy environment --puppetfile --verbose debug $ENV_BASE $ENV_TEST
     - spec/octocatalog/init-system
-    - spec/octocatalog/init-env base test
-    - spec/octocatalog/run-octocatalog base test
+    - spec/octocatalog/init-env
+    - spec/octocatalog/run-octocatalog
 
 test-octocatalog/master:
   <<: *test-octocatalog
@@ -27,8 +26,9 @@ test-octocatalog/master:
     - master
 
   variables:
-    REF_BASE: origin/master
-    R10K: |
+    ENV_BASE: master
+    ENV_TEST: test_octocatalog
+    FILE_R10K: |
       cachedir: 'cache'
       sources:
         plain: