From f89abb94469717e7c35ba01b30b17a320eba4c72 Mon Sep 17 00:00:00 2001 From: Varac Date: Fri, 16 Jun 2017 13:49:35 +0200 Subject: [CI] Use master branch of leap_cli We moved from develop to master some time ago so we should use master for CI testing as well. --- tests/platform-ci/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/platform-ci/Gemfile') diff --git a/tests/platform-ci/Gemfile b/tests/platform-ci/Gemfile index 36f556e5..6ec76b2e 100644 --- a/tests/platform-ci/Gemfile +++ b/tests/platform-ci/Gemfile @@ -13,5 +13,5 @@ group :test do # Use puppet-catalog-test from git because last released gem 0.4.2 gives a deprecation # warning: "[DEPRECATION] `last_comment` is deprecated. Please use `last_description` instead." gem "puppet-catalog-test", :git => 'https://github.com/invadersmustdie/puppet-catalog-test.git' - gem "leap_cli", :git => 'https://leap.se/git/leap_cli.git', :branch => 'develop' + gem "leap_cli", :git => 'https://leap.se/git/leap_cli.git' end -- cgit v1.2.3 From c6ffb01f98f5c78bf25634d57cd05fb57f25c085 Mon Sep 17 00:00:00 2001 From: Varac Date: Fri, 16 Jun 2017 13:44:08 +0200 Subject: [CI] Use older commit for puppet-catalog-test After `puppet-catalog-test` has been recently updated it failed in our CI with: File[/etc/apt/sources.list] has notify relationship to invalid resource Exec[apt_updated] See #8814 for more details. Resolves: #8814 https://github.com/invadersmustdie/puppet-catalog-test/commit/ac386793c2c456d2071dd0adda716224128f0bb3 --- tests/platform-ci/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/platform-ci/Gemfile') diff --git a/tests/platform-ci/Gemfile b/tests/platform-ci/Gemfile index 6ec76b2e..51e2c17b 100644 --- a/tests/platform-ci/Gemfile +++ b/tests/platform-ci/Gemfile @@ -12,6 +12,6 @@ group :test do gem "mocha" # Use puppet-catalog-test from git because last released gem 0.4.2 gives a deprecation # warning: "[DEPRECATION] `last_comment` is deprecated. Please use `last_description` instead." - gem "puppet-catalog-test", :git => 'https://github.com/invadersmustdie/puppet-catalog-test.git' + gem "puppet-catalog-test", :git => 'https://github.com/invadersmustdie/puppet-catalog-test.git', :ref => 'ac386793c2c456d2071dd0adda716224128f0bb3' gem "leap_cli", :git => 'https://leap.se/git/leap_cli.git' end -- cgit v1.2.3 From 30a4bc4eba4654de8e5bd56a083a78b474a2a6ff Mon Sep 17 00:00:00 2001 From: Varac Date: Thu, 29 Jun 2017 15:30:52 +0200 Subject: [CI] Pin leap_cli so fog-aws is installed --- tests/platform-ci/Gemfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/platform-ci/Gemfile') diff --git a/tests/platform-ci/Gemfile b/tests/platform-ci/Gemfile index 51e2c17b..44a8637d 100644 --- a/tests/platform-ci/Gemfile +++ b/tests/platform-ci/Gemfile @@ -13,5 +13,7 @@ group :test do # Use puppet-catalog-test from git because last released gem 0.4.2 gives a deprecation # warning: "[DEPRECATION] `last_comment` is deprecated. Please use `last_description` instead." gem "puppet-catalog-test", :git => 'https://github.com/invadersmustdie/puppet-catalog-test.git', :ref => 'ac386793c2c456d2071dd0adda716224128f0bb3' + # Install fog-aws because the gem dependency of leap_cli is now optional + gem "fog-aws" gem "leap_cli", :git => 'https://leap.se/git/leap_cli.git' end -- cgit v1.2.3 From f365b914662491ab33e6af18e1b02046f6b99538 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 28 Jun 2017 13:24:39 -0700 Subject: leap_cli - make fog gem optional --- tests/platform-ci/Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/platform-ci/Gemfile') diff --git a/tests/platform-ci/Gemfile b/tests/platform-ci/Gemfile index 44a8637d..4cf14e43 100644 --- a/tests/platform-ci/Gemfile +++ b/tests/platform-ci/Gemfile @@ -16,4 +16,5 @@ group :test do # Install fog-aws because the gem dependency of leap_cli is now optional gem "fog-aws" gem "leap_cli", :git => 'https://leap.se/git/leap_cli.git' + gem "fog-aws" end -- cgit v1.2.3