travis: streamline test definitions
No longer distinguish between the tests appart from their distro and architecture from travis' point of view. We must distinguish based on architecture, as we do not yet support cross-architecture builds. We also split by distro as there is no benefit to running tests for different distros on the same VM, as they will not be able to share any chaches, so we might as well parallellize them. Tests that apply to the same distro/architecture combo are now always run on the same VM as to utilize any caching we are able to do. Now that local_boot and empty_blueprint tests have been merged, this will not increase the number of tests currently run on a given VM, so should not affect the total running time of the tests. Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
parent
841c307bf7
commit
cf0c3ea031
1 changed files with 60 additions and 15 deletions
75
.travis.yml
75
.travis.yml
|
|
@ -8,7 +8,7 @@ addons:
|
|||
- gnupg2
|
||||
matrix:
|
||||
include:
|
||||
- name: image-test-empty-blueprint
|
||||
- name: fedora-30
|
||||
arch: amd64
|
||||
language: python
|
||||
python: 3.7
|
||||
|
|
@ -16,17 +16,8 @@ matrix:
|
|||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches x86_64 --cases test/cases/*_empty_blueprint.json
|
||||
- name: image-test-local-boot
|
||||
arch: amd64
|
||||
language: python
|
||||
python: 3.7
|
||||
before_install: sudo apt-get install -y qemu-kvm genisoimage
|
||||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches x86_64 --cases test/cases/*_local_boot.json
|
||||
- name: image-test
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches x86_64 --distro fedora-30
|
||||
- name: fedora-30
|
||||
arch: arm64
|
||||
language: python
|
||||
python: 3.7
|
||||
|
|
@ -34,8 +25,8 @@ matrix:
|
|||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches aarch64
|
||||
- name: image-test
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches aarch64 --distro fedora-30
|
||||
- name: fedora-30
|
||||
arch: s390x
|
||||
language: python
|
||||
python: 3.7
|
||||
|
|
@ -43,4 +34,58 @@ matrix:
|
|||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches s390x
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches s390x --distro fedora-30
|
||||
- name: fedora-31
|
||||
arch: amd64
|
||||
language: python
|
||||
python: 3.7
|
||||
before_install: sudo apt-get install -y qemu-kvm genisoimage
|
||||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches x86_64 --distro fedora-31
|
||||
- name: fedora-31
|
||||
arch: arm64
|
||||
language: python
|
||||
python: 3.7
|
||||
before_install: sudo apt-get install -y qemu-kvm genisoimage
|
||||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches aarch64 --distro fedora-31
|
||||
- name: fedora-31
|
||||
arch: s390x
|
||||
language: python
|
||||
python: 3.7
|
||||
before_install: sudo apt-get install -y qemu-kvm genisoimage
|
||||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches s390x --distro fedora-31
|
||||
- name: fedora-32
|
||||
arch: amd64
|
||||
language: python
|
||||
python: 3.7
|
||||
before_install: sudo apt-get install -y qemu-kvm genisoimage
|
||||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches x86_64 --distro fedora-32
|
||||
- name: fedora-32
|
||||
arch: arm64
|
||||
language: python
|
||||
python: 3.7
|
||||
before_install: sudo apt-get install -y qemu-kvm genisoimage
|
||||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches aarch64 --distro fedora-32
|
||||
- name: fedora-32
|
||||
arch: s390x
|
||||
language: python
|
||||
python: 3.7
|
||||
before_install: sudo apt-get install -y qemu-kvm genisoimage
|
||||
script:
|
||||
# ubuntu's rpm package sets dbpath to ~/.rpmdb, which makes rpm fail...
|
||||
- sudo sh -c 'mkdir /etc/rpm; echo "%_dbpath /var/lib/rpm" > /etc/rpm/macros'
|
||||
- sudo env "PATH=$PATH" "PYTHONUNBUFFERED=1" "OSBUILD_TEST_BUILD_ENV=test/f27-build-from-ubuntu1804.json" test/run --arches s390x --distro fedora-32
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue