diff options
| author | Javier Jardón <jjardon@gnome.org> | 2017-05-11 02:30:28 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2017-05-11 02:30:28 +0000 |
| commit | 557c34d880e56a976db93d2cf8560764057a5e96 (patch) | |
| tree | f05341af35d8f5227327968815ceb290298dd237 | |
| parent | 7334f076a000d57c00fb97814fac17dfe29891eb (diff) | |
| parent | f732de042ab225109df51ea5e5f55c4b2fd527bc (diff) | |
| download | ybd-557c34d880e56a976db93d2cf8560764057a5e96.tar.gz | |
Merge branch 'jjardon/modern_distros' into 'master'
17.19
Test building baserock definitions in modern distros
See merge request !345
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rwxr-xr-x | install_dependencies.sh | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0aec49e..0d7e7dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,24 @@ check_build_ubuntu_16.04: script: - ./ybd.py definitions/systems/minimal-system-x86_64-generic.morph x86_64 +check_build_ubuntu_17.04: + image: ubuntu:17.04 + stage: build + variables: + YBD_kbas_url: "false-url" + YBD_check_definitions: "exit" + script: + - ./ybd.py definitions/systems/minimal-system-x86_64-generic.morph x86_64 + +check_build_fedora_25: + image: fedora:25 + stage: build + variables: + YBD_kbas_url: "false-url" + YBD_check_definitions: "exit" + script: + - ./ybd.py definitions/systems/minimal-system-x86_64-generic.morph x86_64 + check_build_kbas: stage: build variables: diff --git a/install_dependencies.sh b/install_dependencies.sh index 9e856e9..603d10a 100755 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -46,7 +46,7 @@ fi command -v dnf >/dev/null 2>&1 if [ $? -eq 0 ] && [ $installed = false ]; then $SUDO dnf remove -y python-pip - $SUDO dnf install -y which make automake gcc gcc-c++ gawk git m4 wget python python-devel git redhat-rpm-config + $SUDO dnf install -y which make automake gcc gcc-c++ gawk git m4 wget python python-devel git redhat-rpm-config findutils if [ $? -ne 0 ]; then echo "Install failed" exit 1 |