Skip to content
Snippets Groups Projects
Commit b64b5f15 authored by Jana Ziková's avatar Jana Ziková
Browse files

Merge branch '64-update-ci' into 'master'

Resolve "update CI"

Closes #64

See merge request !19
parents 0d8474bd 0dbaee45
No related branches found
No related tags found
1 merge request!19Resolve "update CI"
# Image with everything needed to run Cyber Sandbox Creator. # Image with everything needed to run Cyber Sandbox Creator.
image: ilyavarne/virtualbox-vagrant-ansible-python:debian image: registry.gitlab.ics.muni.cz:443/muni-kypo-csc/cyber-sandbox-creator:debian
# Make sure that VirtualBox kernel modules are loaded and install Python dependencies. # Make sure that VirtualBox kernel modules are loaded and install Python dependencies.
before_script: before_script:
...@@ -29,7 +29,6 @@ original: ...@@ -29,7 +29,6 @@ original:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
debian-stretch: debian-stretch:
...@@ -40,7 +39,6 @@ debian-stretch: ...@@ -40,7 +39,6 @@ debian-stretch:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
debian9: debian9:
...@@ -51,7 +49,6 @@ debian9: ...@@ -51,7 +49,6 @@ debian9:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
ubuntu: ubuntu:
...@@ -62,7 +59,6 @@ ubuntu: ...@@ -62,7 +59,6 @@ ubuntu:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
kali: kali:
...@@ -79,7 +75,6 @@ kali: ...@@ -79,7 +75,6 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
1-router-1-network-1-host: 1-router-1-network-1-host:
...@@ -90,7 +85,6 @@ kali: ...@@ -90,7 +85,6 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
1-router-2-networks-2-hosts: 1-router-2-networks-2-hosts:
...@@ -101,7 +95,6 @@ kali: ...@@ -101,7 +95,6 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
1-router-2-networks-2-hosts-ubuntu: 1-router-2-networks-2-hosts-ubuntu:
...@@ -112,7 +105,6 @@ kali: ...@@ -112,7 +105,6 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
1-router-2-networks-2-hosts-kali: 1-router-2-networks-2-hosts-kali:
...@@ -129,7 +121,6 @@ kali: ...@@ -129,7 +121,6 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
2-routers-2-networks-2-hosts: 2-routers-2-networks-2-hosts:
...@@ -140,7 +131,6 @@ kali: ...@@ -140,7 +131,6 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
2-routers-4-networks-4-hosts: 2-routers-4-networks-4-hosts:
...@@ -151,7 +141,6 @@ kali: ...@@ -151,7 +141,6 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
3-routers-5-networks-5-hosts-br: 3-routers-5-networks-5-hosts-br:
...@@ -162,7 +151,6 @@ kali: ...@@ -162,7 +151,6 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
3-routers-5-networks-5-hosts-br-ansloc: 3-routers-5-networks-5-hosts-br-ansloc:
...@@ -173,5 +161,4 @@ kali: ...@@ -173,5 +161,4 @@ kali:
when: always when: always
# only run for commits to master branch and merge requests # only run for commits to master branch and merge requests
only: only:
- master
- merge_requests - merge_requests
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment