Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
apache
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ansible
apache
Commits
cc8e339b
Commit
cc8e339b
authored
8 years ago
by
nimrod
Browse files
Options
Downloads
Plain Diff
Merge branch 'feature/software_virtualization'
parents
828632ee
a18cf1d5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+9
-3
9 additions, 3 deletions
.travis.yml
molecule.yml
+11
-5
11 additions, 5 deletions
molecule.yml
tests/playbook.yml
+0
-1
0 additions, 1 deletion
tests/playbook.yml
with
20 additions
and
9 deletions
.travis.yml
+
9
−
3
View file @
cc8e339b
...
@@ -2,22 +2,28 @@
...
@@ -2,22 +2,28 @@
language
:
python
language
:
python
python
:
"
2.7"
python
:
"
2.7"
dist
:
trusty
dist
:
trusty
sudo
:
fals
e
sudo
:
Tru
e
group
:
beta
group
:
beta
services
:
[
docker
]
env
:
-
platform
:
openbsd
-
platform
:
xenial
cache
:
cache
:
-
pip
-
pip
-
directories
:
-
directories
:
-
$HOME/.pre-commit
-
$HOME/.pre-commit
install
:
install
:
-
sudo apt-get update
-
sudo apt-get install -y linux-headers-$(uname -r) virtualbox
-
wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb
-
sudo dpkg -i vagrant_1.9.1_x86_64.deb
-
pip install -r tests/requirements.txt | cat
-
pip install -r tests/requirements.txt | cat
-
ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
-
ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
-
molecule dependency
-
molecule dependency
script
:
script
:
-
pre-commit run --all-files
-
pre-commit run --all-files
-
molecule test --
driver docker
-
molecule test --
platform $platform
notifications
:
notifications
:
webhooks
:
https://galaxy.ansible.com/api/v1/notifications/
webhooks
:
https://galaxy.ansible.com/api/v1/notifications/
...
...
This diff is collapsed.
Click to expand it.
molecule.yml
+
11
−
5
View file @
cc8e339b
...
@@ -13,20 +13,26 @@ vagrant:
...
@@ -13,20 +13,26 @@ vagrant:
providers
:
providers
:
-
name
:
virtualbox
-
name
:
virtualbox
type
:
virtualbox
type
:
virtualbox
options
:
cpus
:
1
platforms
:
platforms
:
-
name
:
openbsd
-
name
:
openbsd
box
:
kaorimatz
/openbsd-6.0-
amd64
box
:
fnichol
/openbsd-6.0-
i386
-
name
:
xenial
-
name
:
xenial
box
:
ubuntu/xenial
64
box
:
ubuntu/xenial
32
instances
:
instances
:
-
name
:
example
-
name
:
example
options
:
options
:
append_platform_to_hostname
:
yes
append_platform_to_hostname
:
yes
raw_config_args
:
raw_config_args
:
-
'
vm.synced_folder
".",
"/vagrant",
disabled:
true'
-
'
vm.synced_folder
".",
"/vagrant",
disabled:
true'
-
'
vbguest.auto_update
=
false'
-
'
vbguest.auto_update
=
false
if
Vagrant.has_plugin?("vbguest")'
-
'
landrush.enabled
=
false'
-
'
landrush.enabled
=
false
if
Vagrant.has_plugin?("landrush")'
-
'
landrush_ip.override
=
false'
-
'
landrush_ip.override
=
false
if
Vagrant.has_plugin?("landrush")'
-
|
vm.provider "virtualbox" do |v|
v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
end
docker
:
docker
:
containers
:
containers
:
...
...
This diff is collapsed.
Click to expand it.
tests/playbook.yml
+
0
−
1
View file @
cc8e339b
...
@@ -8,6 +8,5 @@
...
@@ -8,6 +8,5 @@
roles
:
[
debian-bootstrap
]
roles
:
[
debian-bootstrap
]
-
hosts
:
all
-
hosts
:
all
strategy
:
free
roles
:
roles
:
-
role
:
example
-
role
:
example
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment