- - 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
- - spec/octocatalog/run-octocatalog 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
+ - spec/octocatalog/run-octocatalog