Commit Graph

2218 Commits

Author SHA1 Message Date
Martin Pitt
4149d8d810 test: Fix vm.install for non-LVM cloud images
Some of our images, like centos-8-stream, are already built from the
official cloud images instead of virt-install with LVM. More images are
going to do that soon [1][2], so fix vm.install to only do the LVM grow
steps if the image actually uses LVM.

Also adjust the comment, as commit 6ddaa5e0dd fixed this for
RHEL images.

[1] https://github.com/cockpit-project/bots/pull/1518
[2] https://github.com/cockpit-project/bots/pull/1527

(cherry-picked from commit 04ce221a65)
2021-01-08 20:03:29 +01:00
Brian C. Lane
e5b517add6 Automatic commit of package [lorax] release [28.14.57-1].
Created by command:

/usr/bin/tito tag
2020-12-09 16:41:33 -08:00
Anthony F McInerney
4d7dc6f1de fixes #543 qemu -nodefconfig deprecated
Use -no-user-config instead.

Resolves: rhbz#1904168

(cherry picked from commit f66bff5aa7)
Signed-off-by: Brian C. Lane <bcl@redhat.com>
2020-12-09 16:40:53 -08:00
Brian C. Lane
74567d1ae7 sshd_config: Apply suggested changes
Some of the options have been removed, others are now the default.
MOTD still needs to be printed, the boot environment doesn't include the
pam motd module.

Resolves: rhbz#1872892
(cherry picked from commit 51a4a93f90)
2020-12-09 15:20:48 -08:00
Brian C. Lane
c796b7a858 Automatic commit of package [lorax] release [28.14.56-1].
Created by command:

/usr/bin/tito tag
2020-12-03 11:27:39 -08:00
Brian C. Lane
be3aa59daa Switch to using upstream mk-s390image for s390 cdboot.img creation
mk-s390-cdboot has stopped working because the kernel outgrew the
hard-coded offset it used when creating cdboot.img. IBM now has a script
in s390utils that can do the same thing so use the upstream script
instead.

This drops mk-s390-cdboot script, switches the s390 templates to use
mk-s390image from s390utils.

It adds @ROOT@ to cdboot.prm, and sets inst.stage2 so that the installer
image will be found when booting the iso.

Related: rhbz#1892404
2020-12-03 08:37:23 -08:00
Marek Marczykowski-Górecki
6291373794 Add --squashfs-only option to drop inner rootfs.img layer
Make runtime directly into squashfs image. This reduces largely
unreproducible ext4 layer, but requires anaconda's dracut module
modification to properly mount the image.

(cherry picked from commit 27e611629f)
Signed-off-by: Brian C. Lane <bcl@redhat.com>

Resolves: rhbz#1846282
2020-12-02 16:14:35 -08:00
Brian C. Lane
edee60437d Automatic commit of package [lorax] release [28.14.55-1].
Created by command:

/usr/bin/tito tag
2020-09-10 11:56:31 -07:00
Brian C. Lane
51d3e378ba docs: Remove anaconda from rhel-livemedia.ks example
Anaconda no longer includes the liveinst script in the core package.
This means the live iso will just be a live desktop, not a live
installer.

Resolves: rhbz#1876563
2020-09-09 10:55:20 -07:00
Brian C. Lane
a3ea3ae4d9 Automatic commit of package [lorax] release [28.14.54-1].
Created by command:

/usr/bin/tito tag
2020-08-10 16:02:36 -07:00
Brian C. Lane
f112a0cbc7 tests: Fix diff test BACKEND check
The environmental variable we are using is 'BACKEND' not
'COMPOSER_BACKEND'

Related: rhbz#1825190
2020-08-10 11:15:04 -07:00
Brian C. Lane
693309ec30 Automatic commit of package [lorax] release [28.14.53-1].
Created by command:

/usr/bin/tito tag
2020-08-07 12:07:45 -07:00
Alexander Todorov
3ff8614cc7 tests: Push example blueprints b/c they may not exist
Related: rhbz#1825190
2020-08-07 08:50:40 -07:00
Brian C. Lane
93d8e1ed0d rhel-livemedia.ks: Add anaconda-live package to the example kickstart
Anaconda has moved some of the live related requirements into a new
package, anaconda-live, which needs to be included in the kickstart.

Related: rhbz#1691319
2020-08-06 14:28:56 -07:00
Chris Roberts
3e95ebfbc7 Switch VMware testing env to improve stability results
Related: rhbz#1825190
2020-08-04 20:05:34 +03:00
Brian C. Lane
c0592f9546 Automatic commit of package [lorax] release [28.14.52-1].
Created by command:

/usr/bin/tito tag
2020-08-03 11:53:27 -07:00
Alexander Todorov
498dd262f8 Skip test_z_diff() if runninga against for osbuild-composer
See https://github.com/osbuild/osbuild-composer/issues/903

Related: rhbz#1825190
2020-08-03 09:40:23 -07:00
Brian C. Lane
7b645e4fa8 Automatic commit of package [lorax] release [28.14.51-1].
Created by command:

/usr/bin/tito tag
2020-07-28 14:27:54 -07:00
Alexander Todorov
99dec118aa tests: Overwrite rhel-8.json when testing with osbuild-composer
Provides a well-known location of internal repositories and does
not depend on the URLs configured in osbuild-composer itself.

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
b9e5fa5e7b tests: Allow skipping image build in compose sanity test
when $SKIP_IMAGE_BUILD is set the test skips 2 phases:
- start the compose again (after it has been cancelled) and
- waiting for it to finish & downloading the resulting image

This will allow to enable this test script in downstream gating
jobs.

Cherry-picked from cc29b99659,
https://github.com/weldr/lorax/pull/1053/

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
b3ec7af1d1 Set BACKEND=osbuild-composer if running that test scenario
- this will execute cli sanity tests in parallel with the other
- make sure to pass BACKED to vm.install too
- more checks in lib.sh

Cherry-picked from cc29b99659

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
359b99a178 tests: Don't check info after compose cancel with osbuild-composer
osbuild-composer doesn't remove cancelled composes and even if we
wait for the cancellation to take place the UUID is still there
and `compose info` returns an exit code of 0 instead of 1

Cherry-picked from 27c4c67a59

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
de3f548025 tests: Compare blueprints as TOML objects, not strings
this is to avoid differences in ordering and white space. The same
approach is used on rhel7-extras branch.

Cherry-picked from 04bc5e9e86

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
45d227a189 tests: Remove lorax-composer specific checks
Cherry-picked from eb7748236c

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
76b52daa97 tests: Remove compose after we're done
Cherry-picked from 1c218ecbae

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Lars Karlitski
3734129e67 tests: don't use beakerlib in blueprint
b/c for osbuild-composer beakerlib is not included in the
distributions we test on.

Cherry-picked from abcbbf3194

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Lars Karlitski
8f860cc8a1 tests: don't depend on internal state of composer
Cherry-picked from 123827c90a

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
6b2efa0da1 tests: Do not rely on example blueprints
- avoids having to modify them in the first place so less changes
  to the SUT
- will help with transition to osbuild-composer backend
- each test which needs a blueprint either declares it on its own
  (some already do this) or may use a shared blueprints from the
  tests lib dir

Cherry-picked from 7b08fa8838

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
6240df6caf tests: Special case compose types for osbuild-composer
- alibaba - will be added later
- google - will be added later, low priority b/c
  GCE doesn't fully support RHEL8
- live-iso - not supported for now
- ext4 & partitioned disk - removed from osbuild-composer
- hyper-v & liveimg-tar are available only on master branch

Cherry-picked from 4dd7cf8798

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
b72bb63599 tests: Don't check example blueprints if we don't have to
ATM osbuild-composer doesn't ship example blueprints

Cherry-picked from d68e01b7e1

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
9193384bb8 tests: Use BACKEND env variable instead of hard-coded values
- default BACKEND to lorax-composer
- pass BACKEND everywhere we need to

Cherry-picked from 14a3c8d5a7

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Alexander Todorov
a6aab2242a tests: Disable non-cli test scenarios b/c osbuild-composer
the image building functionality is now tested by the
osbuild-composer test suite. We weren't successfull at making this
test suite work with the 2 backends so decided to disabled these
scenarios instead. In the future they will likely be deleted.

Cherry-picked from f1c15c67e0

Related: rhbz#1825190
2020-07-28 14:21:47 -07:00
Brian C. Lane
6deb09db64 Automatic commit of package [lorax] release [28.14.50-1].
Created by command:

/usr/bin/tito tag
2020-07-23 11:10:34 -07:00
Brian C. Lane
088111f087 composer-cli: Make start-ostree parent and ref optional
This changes the start-ostree command to:

compose start-ostree [--size XXXX] [--parent PARENT] [--ref REF] <BLUEPRINT> <TYPE> [<IMAGE-NAME> <PROFILE.TOML>]

Both of them are optional, and if missing a "" is passed to
osbuild-composer. Also adds more tests for all the various possible
options and removes the provider and profile arguments.

(cherry picked from commit 5b0487f47c)

Resolves: rhbz#1859680
2020-07-23 10:35:28 -07:00
Brian C. Lane
dcb2f36c2d composer-cli: Add a get_arg function
This is in preperation for adding more optional arguments. Adds a
generic get_arg function, tests for it, and converts get_size to use it.

(cherry picked from commit 4a4128af23)

Related: rhbz#1859680
2020-07-23 10:35:28 -07:00
Brian C. Lane
6c2c304d98 Automatic commit of package [lorax] release [28.14.49-1].
Created by command:

/usr/bin/tito tag
2020-06-25 14:28:32 -07:00
Dan Horák
b43beffa4f include generic.ins for s390 boot iso
Include the generic.ins file on the s390 boot iso, so it's directly bootable
on an LPAR. The full iso already had generic.ins included.

(cherry picked from commit 0dbfe28745)
Signed-off-by: Brian C. Lane <bcl@redhat.com>

Related: rhbz#1844517
2020-06-25 13:37:09 -07:00
Brian C. Lane
ea48377d6b Fix the bug referenced in the last build
It was the wrong bug to use, changed to the right one so that future
builds have the correct reference.

Resolves: rhbz#1848727
2020-06-22 11:27:52 -07:00
Brian C. Lane
5ab3e14a4e Automatic commit of package [lorax] release [28.14.48-1].
Created by command:

/usr/bin/tito tag
2020-06-18 12:15:12 -07:00
Brian C. Lane
952b34dbca composer-cli: Disable retry counter on connection timeout
urllib3 has a retry system that send the request again when the
connection fails, times out, is redircted, etc. This turns off retries,
which aren't very useful anyway.

Related: rhbz#1844649
2020-06-17 10:21:00 -07:00
Brian C. Lane
800fc3b18b composer-cli: Change timeout to 5 minutes
Related: rhbz#1844649

In some cases osbuild-composer with an empty cache can take longer than
a minute to depsolve and start a compose.
2020-06-16 17:04:47 -07:00
Brian C. Lane
fc7b2931cc Automatic commit of package [lorax] release [28.14.47-1].
Created by command:

/usr/bin/tito tag
2020-06-11 09:18:20 -07:00
Brian C. Lane
54ec52eb25 lorax-composer: Add deprecation notice to documentation
Related: rhbz#1844649
2020-06-11 09:14:11 -07:00
Brian C. Lane
a003c871b3 composer-cli: Add documentation for uploads and osbuild-composer
Related: rhbz#1844649
2020-06-11 09:14:11 -07:00
Brian C. Lane
c300ac6000 composer-cli: Remove the upload and providers commands
These have never been supported on RHEL8 so remove them. Uploads are
supported by osbuild-composer using the 'compose' command.

Related: rhbz#1844649
2020-06-11 09:14:11 -07:00
Brian C. Lane
ba5a36c982 composer-cli: Return a better error with no value
And add tests for the get_size function.

Related: rhbz#1844649
2020-06-11 09:14:11 -07:00
Brian C. Lane
d056c350d4 tests: rhel8-branch uses nose not pytest
It tries to run anything with 'test' in it (and run() is reserved). It
also outputs stderr so only log errors.

Related: rhbz#1844649
2020-06-11 09:14:11 -07:00
Brian C. Lane
10c9b98219 tests: Add tests for composer-cli compose start JSON POST
Related: rhbz#1844649
2020-06-11 09:14:01 -07:00
Brian C. Lane
885866d4cf composer-cli: Update bash completion for start-ostree
Related: rhbz#1844649
2020-06-09 13:55:01 -07:00
Brian C. Lane
7da012a92b composer-cli: Add new start-ostree command
This is used to start an ostree build, it is only supported on
ostree-composer, and requires the ostree ref and parent. It may also
include --size and optionally be uploaded.

Resolves: rhbz#1844649
2020-06-09 13:52:44 -07:00