Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/ng' into ng
Browse files Browse the repository at this point in the history
  • Loading branch information
icymatter committed Oct 1, 2021
2 parents e76f90b + e30d3f0 commit b9879e9
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,18 @@ jobs:
- uses: actions/checkout@v2
- run: make tests TESTS=zypper

# See also
#
# * https://github.com/icy/pacapt/pull/207#issuecomment-929220016
# * https://bugzilla.opensuse.org/show_bug.cgi?id=1190670
# * https://github.com/moby/moby/pull/42836
#
zypper-seccomp:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: make tests TESTS=zypper IMAGES=opensuse/tumbleweed:latest

opkg:
runs-on: ubuntu-latest
steps:
Expand Down
9 changes: 5 additions & 4 deletions tests/yum.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ in -Qc rpm
ou ^*\s.+[0-9]$

# List packages with available updates
# oraclelinux/slim may doesn't show anything
in -Qu
ou ^[a-z0-9\-]+\.x86_64.+(baseos|updates|ol7_latest)$
ou ^(([a-z0-9\-]+\.x86_64.+(baseos|updates|ol7_latest))|(Loaded plugins: ovl))$
in -Sy
ou ^[a-z0-9\-]+\.x86_64.+(baseos|updates|ol7_latest)$
ou ^(([a-z0-9\-]+\.x86_64.+(baseos|updates|ol7_latest))|(Loaded plugins: ovl))$

# Get installed packages unavailable in repos
in -Qm
Expand Down Expand Up @@ -86,9 +87,9 @@ ou empty

# Update
in -Su
ou ^Up(dat|grad)ing:$
ou ^((Up(dat|grad)ing:)|((Loaded plugins: ovl)))$
in -Suy
ou ^[a-z0-9\-]+\.x86_64.+(baseos|updates|ol7_latest)$
ou ^(([a-z0-9\-]+\.x86_64.+(baseos|updates|ol7_latest))|((Loaded plugins: ovl)))$

# Search packages
in -Ss wget
Expand Down
7 changes: 6 additions & 1 deletion tests/zypper.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@

im opensuse/leap:15.2
im opensuse/leap:42.3
im opensuse/tumbleweed:latest

# FIXME: We disable this but also create a specific test from
# FIXME: github/workflow (zypper-seccomp). We should re-enable
# FIXME: this once the upstream issues are gone
# im opensuse/tumbleweed:latest

# im opensuse/clair:latest
im zypper_bash3

Expand Down

0 comments on commit b9879e9

Please sign in to comment.