1
0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-06 21:45:24 +01:00
Commit Graph

49 Commits

Author SHA1 Message Date
baude
c64d77f883 Add copr builds
When a PR is merged, COPR will build a new atomic rpm
here:

https://copr.fedorainfracloud.org/coprs/baude/Upstream_CRIO_Family/

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1187
Approved by: giuseppe
2018-02-13 15:55:33 +00:00
Giuseppe Scrivano
16b4f09cf3 syscontainers: cleanup on GLib.Error
This is the exception type raised by OSTree if the checkout fails.  I've
observed while running out of space on /var and the installation left
the incomplete checkout for the container.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1116
Approved by: ashcrow
2017-10-12 15:19:15 +00:00
Yu Qi Zhang
14e878dbfc Fix tests for f26
Fix test failures after updating papr to test with f26 atomic/cloud
images instead of f25, with the following changes:

1. Remove dependency on docker hub tester image. Instead, mimic
what ostree/rpm-ostree does and use a recursive .papr.sh script
to install the necessary packages to the base f26 image in the
fedora registry. This fixes tests on the atomic host since python3.6
is being used, and prevents future tests from testing the wrong
version. (Note this is slightly slower due to having to install
packages during the test rather than using a pre-built image).

2. Fix some pylint errors, and mask others for now

3. Fix failing integration tests due to inter-test interference

4. Remove unnecessary deepcopy in container filter

5. Add compatibility for both c-s-s and d-s-s in storage

6. Update expected sha256 values for dockertar test

Remaining issues:

1. test_storage should possibly be reworked. The current test
setup is conflicting with the new default of overlay as a driver.
For now, the test for generated d-s-s is disabled.

2. some storage commands are still using "docker-storage-setup"
instead of "container-storage-setup". There is a backward
compatible check in place that should be reworked in the future

3. some masked pylint errors should be further investigated

4. keep the dockerfile for the project atomic tester image for now
(bump to 26), since its a little easier and faster to set up with

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #1076
Approved by: baude
2017-08-23 18:33:48 +00:00
Giuseppe Scrivano
3925aa6da2 Makefile: add new rule test-suite
Sometimes I don't want to wait for pylint to complete.  Add a new
makefile rule that launches directly the tests suite.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #949
Approved by: baude
2017-03-29 13:44:47 +00:00
Brent Baude
68ed629262 Add ability to build/install on atomic-os
Making it easier for dev and test to be able to build and
install from git on an atomic os.

sudo make install-on-atomicos

Closes: #854
Approved by: baude
2017-01-30 20:20:26 +00:00
Giuseppe Scrivano
16c934b6b9 tests: replace sed with a python script
now that we store the raw manifest, there are two "digest" fields both
lowercase.  Replace the sed script with a python script that parses
the JSON document.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #779
Approved by: rhatdan
2016-12-09 15:29:18 +00:00
Brent Baude
8ea8d1e82e make vagrant-check: Run tests with vagrant
Run tests in a vagrant session (w/libvirt for now).  This allows
the tests to occur similar to the way our jenkins tests work. Run
make vagrant-check and we created an F24 session and install
the proper deps.  We then call the .redhat-ci.sh script inside
the vagrant session and the tests are executed.  At this time, you
will need to vagrant halt to shutdown the session when comlete.

By default, the tests will exeute on an instance of fedora-24-atomic.
You can test on Colin's CAHC centos-atomic by:

make vagrant-check BOX=centos_atomic

Closes: #736
Approved by: rhatdan
2016-11-07 17:01:06 +00:00
Antonio Murdaca
5dfcaa9c93 remove sigstore conf
Signed-off-by: Antonio Murdaca <runcom@redhat.com>

Closes: #706
Approved by: baude
2016-10-13 14:49:12 +00:00
root
488c096b77 adding line to create /var/lib/atomic/sigstore
Closes: #656
Approved by: rhatdan
2016-09-22 15:14:56 +00:00
Brent Baude
bfb760e7bb default.yaml: Define a default yaml for signing.
The default.yaml is useful for out of the box
experience.  It allows the user to begin signing
once atomic is install (and they have the proper
gpg requirements).

Note the .spec file will need to be updated to
handle /etc/containers/registries.d/default.yaml.

Closes: #633
Approved by: rhatdan
2016-09-19 21:09:50 +00:00
Colin Walters
5a3ff0dd1c build: Stop trying to build gomtree
Doing things this way isn't "reproducible" - it won't work inside a
build system requires offline sources only, like current CAHC does.

gomtree needs to be packaged separately.

Closes: #547
Approved by: rhatdan
2016-08-19 18:09:27 +00:00
Giuseppe Scrivano
18be700fc5 remove gomtree binary blob
Add Makefile rules to build it from the code repository

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #536
Approved by: cgwalters
2016-08-19 14:14:24 +00:00
Shishir Mahajan
aeedcef247 Source code for gotar binary
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>

Closes: #542
Approved by: giuseppe
2016-08-18 18:33:42 +00:00
Dan Walsh
45ec779178 Move generate from atomic verify to atomic images
Also breakout images handling into a separate python file.

Atomic/images.py

I have switched atomic images generate to generate an images
mtree file for each image in the system.

Closes: #534
Approved by: giuseppe
2016-08-16 08:03:19 +00:00
Stephen Chung
d4728ae10f verify: validate layers of system image stored on disk
Integrate go-mtree tool into atomic CLI command, `atomic verify -V <imagename>`.
(Note that `gomtree` is still in development and thus we would need some way of
obtaining updated gomtree binaries) When a user does an atomic pull,
validation manifests for that system image's layers are created and stored in
/var/lib/atomic. When user does `atomic verify -V <system image>`, these manifests
are then validated against the image that is on disk (which would be stored in ostree).

Signed-off-by: Stephen Chung <schung@redhat.com>

Closes: #531
Approved by: rhatdan
2016-08-12 18:55:44 +00:00
Giuseppe Scrivano
d6eb918c62 Makefile: add missing dependency for dockertar-sha256-helper
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #524
Approved by: rhatdan
2016-08-09 17:00:29 +00:00
Jonathan Lebon
d1051b91c6 Makefile: make pylint executables more generic
Use "$PYTHON -m pylint" rather than harcoding a pylint path, which is
more generic and will work regardless of whether pylint was installed by
dnf or pip.

Otherwise you can get nasty issues like pip and RPM stepping on each
other's toes trying to own /usr/bin/pylint. Also,
/usr/bin/python3-pylint is only installed by the RPM package, not by the
pip package.

Closes: #490
Approved by: cgwalters
2016-07-19 22:59:12 +00:00
Giuseppe Scrivano
27c6a85d5e Makefile: add an alias "check" for running tests.
I've mistakenly typed it every single time...

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #478
Approved by: rhatdan
2016-07-15 13:39:02 +00:00
Dan Walsh
17e887ace7 Lots of cleanups for pylint and python3-lint warnings
Closes: #463
Approved by: jlebon
2016-07-14 22:02:54 +00:00
Dan Walsh
5fb6fe2dcc Fix build issues on python3 with python3-pylint
Force make test to test python3-pylint.

Closes: #453
Approved by: jlebon
2016-07-08 16:22:17 +00:00
Giuseppe Scrivano
21a1a1d98b tests: do not run destructive tests by default
I don't feel comfortable with running test_storage.sh on my
development machine, so enable it only with ENABLE_DESTRUCTIVE=1.

Tests are marked to be destructive with an inline tag ":destructive-test".

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #392
Approved by: jlebon
2016-05-31 19:15:57 +00:00
Brent Baude
22c40f50e7 Improve errors msgs for no configured scanners
Eventually we will not ship any default scanner configurations.  Previous
code relied on there always being one (default) defined so improved
error messages and a conditional check was in order.

Closes: #380
Approved by: rhatdan
2016-05-12 14:44:44 +00:00
Dan Walsh
ba2330ea60 Label temporary containers with /usr label
Also rework Atomic/mount.py to be a subclass of Atomic class
2016-05-02 11:43:14 -04:00
Giuseppe Scrivano
57b01ed630 Add helper to compute sha256 for Docker save'd tarballs
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2016-04-18 20:27:31 +02:00
Dan Walsh
8dd63e4336 install openscap config in /etc/atomic.d
Closes: #341
Approved by: rhatdan
2016-04-07 14:56:41 +00:00
Brent Baude
6ed4994b0d Implement generic scanning in Atomic
As more scanners besides openscap become available, atomic
can now begin to leverage them.  The new scan function has
been broken out into its on file (scan.py).

The scan command itself now defaults to openscap but can
also be switched to blackduck with --scanner.

Atomic now can use a configuration file which is stored
in /etc/atomic.conf.  The location of the atomic conf
file can be overriden with the environment variable
'ATOMIC_CONF'.  In the case of the scan function,
we need the scanner defined in the configuration file
as well as the fully qualified image name and the
scan arguments.  Optionally, you can provide additional
custom docker arguments for the scanner as well
2016-04-07 09:33:00 -05:00
Dan Walsh
39251596ea Fixes for running atomic on python3 2016-03-10 09:23:15 -05:00
Dan Walsh
03f8e94871 Remove egg-info
We want to remove this because of issues discussed in this:

https://github.com/projectatomic/atomic/issues/268
https://github.com/projectatomic/atomic/pull/180
2016-01-25 12:40:58 -05:00
Charlie Drage
06a3fbbdf1 Let test.sh decide if bash, not Makefile 2016-01-18 11:08:32 -05:00
Shishir Mahajan
5490e26820 Atomic migrate command: Fix review comments
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-11-13 10:10:12 -05:00
Shishir Mahajan
d96e9049b6 Atomic migrate command: This command migrates docker instance (images, containers and volumes)
from one backend storage to another e.g. devicemapper to overlayfs.

Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-11-12 11:58:10 -05:00
Robert Kuska
38a784e8e4 Create separate install-only target
install target runs both install and build phases
of python, we therefore move pure installation
to separate target install-only
2015-11-11 12:56:28 +01:00
Robert Kuska
d64ca9d211 Make pylint check optional
Currently it is not possible to build atomic via
make without pylint. We therefore move pylint check
to separate make target
2015-11-11 12:36:25 +01:00
Martin Preisler
4a4a3a7c4f Allow GO_MD2MAN path to be configurable via env variable
Also added a touch invocation to allow users to do:
GO_MD2MAN=/bin/true make
This skips building the manuals which helps on systems where getting
the md2man tool is difficult. This is similar to the trick that can be
used for PYLINT:
`PYLINT=/bin/true GO_MD2MAN=/bin/true make` now works.
2015-10-07 15:39:27 +02:00
Jonathan Lebon
7f9b874de2 Makefile: remove atomic target
The `python-build` target lists `atomic` as a prerequisite target.
However, there is no explicit target named 'atomic', so `make` tries to
find any implicit rules that apply. One of the rules that it tries is
whether the unprocessed file is called `atomic.sh`. Since that file
exists, it proceeds by copying `atomic.sh` to `atomic` if e.g.
`atomic.sh` is newer than `atomic`:

     Considering target file 'python-build'.
      File 'python-build' does not exist.
       Considering target file 'atomic'.
        <snip>
        Found an implicit rule for 'atomic'.
         Considering target file 'atomic.sh'.
          <snip>
          Finished prerequisites of target file 'atomic.sh'.
         No need to remake target 'atomic.sh'.
        Finished prerequisites of target file 'atomic'.
        Prerequisite 'atomic.sh' is newer than target 'atomic'.
       Must remake target 'atomic'.
   cat atomic.sh >atomic

This patch removes the `atomic` target which does not exist, and also
explicitly makes all the other non-file targets phonies to make sure no
name collisions will happen again (and as a plus, improve performance).
2015-10-06 14:40:45 -04:00
Jonathan Lebon
47cc3dd642 pylint: scan all the python files
We were only scanning the ./atomic file with pylint. This patch adds all
the other python files to the list. We also add some pylint directives
to suppress some benign errors.
2015-09-29 14:37:01 -04:00
Dan Walsh
d242bc6513 Change upload to push
Leave aliase of upload
2015-09-01 08:11:34 -04:00
Dan Walsh
fea1b998de Make PYLINT a environment variable 2015-07-14 08:53:19 -04:00
Dan Walsh
735ab7b6b5 Rename atomic_server.py to atomic_dbus.py
Also cleanup setup.py to handle most of the setup.
setup handles python3 issues better then standard Makefile
2015-07-13 08:30:33 -04:00
Brian (bex) Exelbierd
a6acbbb5d9 Add generated manage pages to make clean 2015-06-18 13:00:58 +02:00
Dan Walsh
60f2dadf23 Add dbus support for version and verify 2015-05-18 10:04:53 -04:00
Lokesh Mandvekar
4ff7dbd69a install manpages with -m 644
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2015-03-13 13:38:20 -04:00
Dan Walsh
40e5317f8d Add bash-completion script 2015-03-06 14:50:28 -05:00
Colin Walters
408f79f35e build: Move manpage rules upstream here
From initial code by Lokesh Mandvekar in https://github.com/lsm5/atomic-rpm
2015-02-18 17:45:25 -05:00
Colin Walters
6a27fac524 build: "all" should be default, don't run tests on install
Neither "make" or "make install" should not run tests.  Further,
change the default target to be "all" by listing it first.
2015-02-18 16:53:05 -05:00
Dan Walsh
814152f725 Make sure NetworkManager configures resolv.conf correctly 2015-02-08 17:33:44 +01:00
Colin Walters
deb2766f65 build: Run pylint from build by default
It's kind of like using a statically compiled language...
2015-01-28 16:51:52 -05:00
Dan Walsh
37f9be0583 Clean up make 2015-01-28 08:42:55 -05:00
Dan Walsh
1ba36535e0 Add /etc/profile.d/atomic.sh to run missing commands in tools container
Also add Makefile to help with installation, and atomic.sysconfig
to define the TOOLSIMG tools image.
2015-01-27 16:28:09 -05:00