summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Collapse)AuthorAge
* Touchup upstream DockerfileTomSweeneyRedHat2019-06-08
| | | | | | | | The upstream/Dockerfile had a few issues that this cleans up. A few files were misplaced, wrong installs and removes. This corrects those issues. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* Merge pull request #3253 from cevich/clean_brent_messOpenShift Merge Robot2019-06-08
|\ | | | | Cirrus: Minor cleanup of dependencies and docs
| * Cirrus: Minor cleanup of dependencies and docsChris Evich2019-06-06
| | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | Bump to v1.4.1-devMatthew Heon2019-06-07
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Bump to v1.4.0v1.4.0Matthew Heon2019-06-07
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Cirrus: Track VM Image calling GCE projectChris Evich2019-06-05
|/ | | | | | | | | | With multiple `containers` projects updating VM Image metadata, it would be very difficult to discover which Cirrus-CI setup was responsible. Add the GCE project name to the list of metadata labels to update when this container runs. This will give more context as to which images are currently in use. Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #3156 from TomSweeneyRedHat/dev/tsweeney/podmanimageOpenShift Merge Robot2019-06-04
|\ | | | | Create Dockerfiles for podmanimage
| * Create Dockerfiles for podmanimageTomSweeneyRedHat2019-06-01
| | | | | | | | | | | | | | | | | | | | | | | | The Dockerfiles necessary to create the stable, testing and upstream container images on quay.io/user/podman. Once this is commited, I will set up those images such that they will be built with every git commit. stable - Latest Fedora release image testing - Latest release on bohdi Fedora testing upstream - Latest version in upstream podman Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | cirrus: minor cleanup and refactoringEd Santiago2019-06-03
|/ | | | | | | | | | | | | | | | | | | | | | ...with the goal of (very soon) reusing this code, in #2947, to run system tests in CI. This is the cleanest way I can think of to do so without duplication or a large maintenance burden. Changes are: - replace references to 'ginkgo' with 'integration'. That target is already in Makefile, and is not only more readable, it's also more abstract. There is no reason for this level of code to know about ginkgo. - allow rootless_test.sh to accept an argument, that being the name of the test suite to run (default: integration). #2947 will enable 'system'. - allow integration_test.sh to serve multiple purposes, by checking its filename. #2947 will add a symlink, system_test.sh, which will then cascade down to invoke system tests. Signed-off-by: Ed Santiago <santiago@redhat.com>
* split rootless local and remote testingbaude2019-05-31
| | | | Signed-off-by: baude <bbaude@redhat.com>
* do not run remote tests inside containerbaude2019-05-30
| | | | | | | when running the podman integration tests inside a container, we should not be running the remote tests. Signed-off-by: baude <bbaude@redhat.com>
* Merge pull request #3210 from haircommander/conmon-0.2.0OpenShift Merge Robot2019-05-28
|\ | | | | bump conmon to v0.2.0
| * bump conmon to v0.2.0Peter Hunt2019-05-28
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | Cirrus: Add zip package to imagesChris Evich2019-05-23
| | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | Cirrus: Fix missing CRIO_COMMIT -> CONMON_COMMITChris Evich2019-05-21
| | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | Cirrus: workaround root expand failureChris Evich2019-05-21
| | | | | | | | | | | | | | | | | | Occasionally, and seemingly only on F29 the root disk fails to expand upon boot. When this happens, any number of failures could occur if space runs out. Until there is time to investigate the actual cause, workaround this problem by detecting it and acting accordingly. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Cirrus: Stub in F30 supportChris Evich2019-05-21
| | | | | | | | | | | | | | | | | | | | | | New base-image boots, a cache-image builds, but more work is needed for it to be prime-time ready. This commit just adds some updates to the scafolding necessary to build the base-image. Future work will make F30 more of a reality. Also add log-collection scripts to test image verification task Signed-off-by: Chris Evich <cevich@redhat.com>
* | Cirrus: fixups based on review feedbackChris Evich2019-05-21
| | | | | | | | | | | | Also remove disused distros (RHEL/CentOS/FAH) and fix get_ci_vm script Signed-off-by: Chris Evich <cevich@redhat.com>
* | Cirrus: Overhaul/Simplify env. var setupChris Evich2019-05-21
| | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | Cirrus: Run tests on test-built cache-imagesChris Evich2019-05-21
| | | | | | | | | | | | Also, add jq and catatonit installs to images. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Cirrus: Support testing of VM cache-image changesChris Evich2019-05-21
| | | | | | | | | | | | | | | | | | | | | | | | Previously, it was quite difficult to affect changes to VM cache images without lots of manual work. This commit adds a new optional testing task which mirrors the official-image build task which only runs on master. In contrast, the new task may be run at any time in a PR, but including a magic phrase in the PR description. Update documentation to describe the new task and inform on it's usage. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Cirrus: Remove "too new" runc hackChris Evich2019-05-21
|/ | | | | | | | | Hack was to workaround not having fix for: https://bodhi.fedoraproject.org/updates/FEDORA-2019-b4356521ba Update `RUNC_COMMIT` value to match commit id to working package. Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #3152 from rhatdan/remoteOpenShift Merge Robot2019-05-20
|\ | | | | install.remote should be separate for install.bin
| * install.remote should be separate for install.binDaniel J Walsh2019-05-17
| | | | | | | | | | | | | | For people who want to install podman remote or podman only we need to separate out the two install commands. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #2844 from haircommander/cri-o-updateOpenShift Merge Robot2019-05-17
|\ \ | | | | | | move to cri-o/cri-o and build with containers/conmon
| * | Use containers/conmonPeter Hunt2019-05-17
| | | | | | | | | | | | | | | | | | There were some build issues updating cri-o to cri-o/cri-o. Since the only thing we need cri-o for is conmon, we should just build using conmon. Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | s|kubernetes-sigs/cri-o|cri-o/cri-o|gPeter Hunt2019-05-17
| |/ | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* / Cirrus: Confirm networking is workingChris Evich2019-05-17
|/ | | | | | Thanks to @edsantiago for suggestion to use nc Signed-off-by: Chris Evich <cevich@redhat.com>
* Bump to v1.3.2-devMatthew Heon2019-05-16
| | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Merge pull request #3089 from baude/splittestOpenShift Merge Robot2019-05-15
|\ | | | | split remote tests from distro tests
| * split remote tests from distro testsbaude2019-05-13
| | | | | | | | | | | | | | | | We want the remote tests for our distributions to be tested in a different VM than the local tests. This allows for faster CI runs and easier debug as well as seperation of flakes. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #2705 from adrianreber/ci-testOpenShift Merge Robot2019-05-13
|\ \ | |/ |/| Enabling checkpoint/restore testing on Fedora >= 29 again
| * Upgrade to latest criu and selinux-policyAdrian Reber2019-05-06
| | | | | | | | | | | | This fixes all the current errors concerning checkpoint/restore. Signed-off-by: Adrian Reber <areber@redhat.com>
* | enable integration tests for remote-clientbaude2019-05-07
| | | | | | | | | | | | | | first pass at enabling a swath of integration tests for the remote-client. Signed-off-by: baude <bbaude@redhat.com>
* | Bump to v1.3.1-devMatthew Heon2019-05-06
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* change from sysregistries to sysregistriesv2Daniel J Walsh2019-05-03
| | | | | | | | We want to start supporting the registries.conf format. Also start showing blocked registries in podman info Fix sorting so all registries are listed together in podman info. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Cirrus: timestamp all output script outputChris Evich2019-05-02
| | | | | | Also remove direct time-stamping by CI scripts that would compete. Signed-off-by: Chris Evich <cevich@redhat.com>
* cirrus lib.sh: refactor req_env_var()Ed Santiago2019-05-02
| | | | | | | | | | | | | | | Existing code was not working due to a bash gotcha ('exit' from a pipeline). It also had unnecessary duplication. New version is safer; also includes unit tests run under localunit. Existing invocations of req_env_var replaced via: $ [ edit setup_environment.sh, move one closing quote to its own line ] $ perl -ni -e 's/(?<=req_env_var )"(\S+)\s+\$\1"/$1/; if (/req_env_var "$/ .. /^\s*"/) { chomp; s/(?<=\S)\s.*//; if (/^\s*"/) { print "\n" } else { unless (/req_env_var/) { s/^\s+//; print " ";} print;} } else { print }' $(ack -l req_env_var) $ [ hand-massage an incorrect instance of '@' in lib.sh:ircmsg() ] Signed-off-by: Ed Santiago <santiago@redhat.com>
* remove manual install of libsystemd-devbaude2019-04-26
| | | | Signed-off-by: baude <bbaude@redhat.com>
* Merge pull request #2991 from cevich/libsystemd_devOpenShift Merge Robot2019-04-26
|\ | | | | Libsystemd dev + newer runc
| * Cirrus: fix obsolete Ubuntu packageChris Evich2019-04-24
| | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * Cirrus: Install libsystemd-dev on UbuntuChris Evich2019-04-24
| | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | journald event loggingbaude2019-04-24
|/ | | | | | | | | add the ability for podman to read and write events to journald instead of just a logfile. This can be controlled in libpod.conf with the `events_logger` attribute of `journald` or `file`. The default will be set to `journald`. Signed-off-by: baude <bbaude@redhat.com>
* Cirrus: Temp. override container-selinux on F29Chris Evich2019-04-24
| | | | | | Also, undo oooooold runc package hack Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #2948 from baude/remotepauseOpenShift Merge Robot2019-04-18
|\ | | | | podman-remote pause|unpause
| * podman-remote pause|unpausebaude2019-04-18
| | | | | | | | | | | | | | | | Add the ability to pause and unpause containers with the remote client. Also turned on the pause tests! Signed-off-by: baude <bbaude@redhat.com>
* | Fix COPR builds to start working againbaude2019-04-17
|/ | | | | | We now need systemd in the root of the COPR build for podman. Signed-off-by: baude <bbaude@redhat.com>
* cirrus: enable remote tests for rootlessGiuseppe Scrivano2019-04-08
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* test: fix remote tests for rootlessGiuseppe Scrivano2019-04-08
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Cirrus: Support special-case modes of testingChris Evich2019-04-03
| | | | | | | | | | | | | | | | | | | | | | Previously libpod CI was fairly straight-forward, run unit and integration tests in a standard set of 3 VMs. Off on the side was a single special case of running tests as an ordinary user. There is a desire to stop using the PAPR system to support testing inside of a container. Since having two special cases potentially invites more down the road, make provisions to handle them more gracefully. This commit introduces an environment variable: ``$SPECIALMODE``. It's value has the following meanings within the CI scripts: Mode 'none': Nothing special, business as usual (default) Mode 'rootless': Rootless testing Mode 'in_podman': Build container, run integration tests in it. This will make adding additional special-cases later easier, as well as extending the special cases in a Matrix across multiple OS's. Signed-off-by: Chris Evich <cevich@redhat.com>