From 8a7d6ae5bac366431cec2e4c281271334d3769fd Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 17 May 2016 11:40:22 +0200 Subject: ignore Gemfile.lock --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 30792935..146a1006 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /.vagrant /puppet/modules/site_custom +Gemfile.lock -- cgit v1.2.3 From 5fb5beff4c4d97dec2fcdab78d530e2c0b1d1cc9 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 11 Jun 2016 21:09:49 +0200 Subject: add test provider for catalog compile test --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 146a1006..e7be571f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /.vagrant /puppet/modules/site_custom -Gemfile.lock +/Gemfile.lock +/tests/puppet/provider/hiera +/tests/puppet/provider/test -- cgit v1.2.3 From b72030ef29340539b6e7870f189b6135937a6945 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 2 Jul 2016 21:17:40 +0200 Subject: remove private stuff from test provider dir --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e7be571f..8090545e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,9 @@ /puppet/modules/site_custom /Gemfile.lock /tests/puppet/provider/hiera +/tests/puppet/provider/secrets.json +/tests/puppet/provider/files/ssh/authorized_keys +/tests/puppet/provider/files/nodes/ /tests/puppet/provider/test +/tests/puppet/provider/users/gitlab-runner/ +/builds -- cgit v1.2.3 From f0dda1dd4ec063233b0d266b092d809c6243c354 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 2 Jul 2016 21:22:51 +0200 Subject: Update .gitlab-ci.yml and build config for local builds --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 8090545e..eff8f474 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /tests/puppet/provider/secrets.json /tests/puppet/provider/files/ssh/authorized_keys /tests/puppet/provider/files/nodes/ +/tests/puppet/provider/users/ /tests/puppet/provider/test /tests/puppet/provider/users/gitlab-runner/ /builds -- cgit v1.2.3 From dd68ec1b0b9f8c44187de29429e28dd0a2f7b2e7 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 5 Jul 2016 15:27:30 +0200 Subject: add gitlab-runners pubkey --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index eff8f474..7f9f2138 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,8 @@ /tests/puppet/provider/secrets.json /tests/puppet/provider/files/ssh/authorized_keys /tests/puppet/provider/files/nodes/ -/tests/puppet/provider/users/ +/tests/puppet/provider/users/* +!/tests/puppet/provider/users/gitlab-runner +!/tests/puppet/provider/users/gitlab-runner/* /tests/puppet/provider/test -/tests/puppet/provider/users/gitlab-runner/ /builds -- cgit v1.2.3 From 3e36abee5e0b2a4017da473fae97eff281989115 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 16 Jul 2016 18:19:58 +0200 Subject: Add catalogtest node, remove single node --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 7f9f2138..9f24fd63 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,10 @@ /tests/puppet/provider/secrets.json /tests/puppet/provider/files/ssh/authorized_keys /tests/puppet/provider/files/nodes/ +/tests/puppet/provider/nodes/* +!/tests/puppet/provider/nodes/catalogtest.json +/tests/puppet/provider/tags/* +!/tests/puppet/provider/tags/catalogtest.json /tests/puppet/provider/users/* !/tests/puppet/provider/users/gitlab-runner !/tests/puppet/provider/users/gitlab-runner/* -- cgit v1.2.3 From e6544ecc5a51ad6502a64bd08df71aa7ff75a3ee Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 29 Aug 2016 16:39:13 -0700 Subject: moved vagrant example provider to tests/example-provider --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 9f24fd63..146bd8ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/.vagrant +/tests/example-provider/.vagrant /puppet/modules/site_custom /Gemfile.lock /tests/puppet/provider/hiera -- cgit v1.2.3 From 1d56c0a7795ef87e34bd06c93a6525f3068aa536 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 29 Aug 2016 21:13:42 -0700 Subject: move platform ci tests to tests/platform-ci --- .gitignore | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 146bd8ce..0b3cf120 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,22 @@ /tests/example-provider/.vagrant + /puppet/modules/site_custom -/Gemfile.lock -/tests/puppet/provider/hiera -/tests/puppet/provider/secrets.json -/tests/puppet/provider/files/ssh/authorized_keys -/tests/puppet/provider/files/nodes/ -/tests/puppet/provider/nodes/* -!/tests/puppet/provider/nodes/catalogtest.json -/tests/puppet/provider/tags/* -!/tests/puppet/provider/tags/catalogtest.json -/tests/puppet/provider/users/* -!/tests/puppet/provider/users/gitlab-runner -!/tests/puppet/provider/users/gitlab-runner/* -/tests/puppet/provider/test + +/tests/platform-ci/.bundle +/tests/platform-ci/vendor +/tests/platform-ci/bin +/tests/platform-ci/Gemfile.lock +/tests/platform-ci/provider/hiera +/tests/platform-ci/provider/secrets.json +/tests/platform-ci/provider/files/ssh/authorized_keys +/tests/platform-ci/provider/files/nodes/ +/tests/platform-ci/provider/nodes/* +!/tests/platform-ci/provider/nodes/catalogtest.json +/tests/platform-ci/provider/tags/* +!/tests/platform-ci/provider/tags/catalogtest.json +/tests/platform-ci/provider/users/* +!/tests/platform-ci/provider/users/gitlab-runner +!/tests/platform-ci/provider/users/gitlab-runner/* +/tests/platform-ci/provider/test + /builds -- cgit v1.2.3 From f9033a4bd2819a167ec08852dfb6c79891c8aea6 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 12 Oct 2016 13:22:29 +0200 Subject: Gitignore some files needed for cibuilds --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 0b3cf120..62d47d92 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,13 @@ /tests/platform-ci/vendor /tests/platform-ci/bin /tests/platform-ci/Gemfile.lock +/tests/platform-ci/provider/cloud.json +/tests/platform-ci/provider/facts.json /tests/platform-ci/provider/hiera /tests/platform-ci/provider/secrets.json +/tests/platform-ci/provider/users /tests/platform-ci/provider/files/ssh/authorized_keys +/tests/platform-ci/provider/files/ssh/known_hosts /tests/platform-ci/provider/files/nodes/ /tests/platform-ci/provider/nodes/* !/tests/platform-ci/provider/nodes/catalogtest.json -- cgit v1.2.3 From 1438c4d5ed1c4fb63c8003f8bd3cbca78ce0252c Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 14 Oct 2016 19:41:29 +0200 Subject: Add public sshkey of gitlab-runner for platform builds --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 62d47d92..d80ef422 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ /tests/platform-ci/provider/facts.json /tests/platform-ci/provider/hiera /tests/platform-ci/provider/secrets.json -/tests/platform-ci/provider/users /tests/platform-ci/provider/files/ssh/authorized_keys /tests/platform-ci/provider/files/ssh/known_hosts /tests/platform-ci/provider/files/nodes/ @@ -20,7 +19,8 @@ !/tests/platform-ci/provider/tags/catalogtest.json /tests/platform-ci/provider/users/* !/tests/platform-ci/provider/users/gitlab-runner -!/tests/platform-ci/provider/users/gitlab-runner/* +/tests/platform-ci/provider/users/gitlab-runner/* +!/tests/platform-ci/provider/users/gitlab-runner/gitlab-runner_ssh.pub /tests/platform-ci/provider/test /builds -- cgit v1.2.3