Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: add Fedora 37 #111

Merged
merged 2 commits into from
Jan 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ RPM:
- RUNNER:
- aws/fedora-36-x86_64
- aws/fedora-36-aarch64
- aws/fedora-37-x86_64
- aws/fedora-37-aarch64
- aws/rhel-8.6-ga-x86_64
- aws/rhel-8.6-ga-aarch64

Expand All @@ -42,14 +44,12 @@ Testing:
- schutzbot/update_github_status.sh update
parallel:
matrix:
# https://quay.io/repository/osbuild/postgres available only for x86_64
- RUNNER:
# https://quay.io/repository/osbuild/postgres available only for x86_64
# - aws/fedora-33-aarch64
- aws/fedora-36-x86_64
# - aws/fedora-34-aarch64
- aws/fedora-37-x86_64
- RUNNER:
- aws/rhel-8.6-ga-x86_64
# - aws/rhel-8.4-ga-aarch64
INTERNAL_NETWORK: ["true"]

finish:
Expand Down
4 changes: 2 additions & 2 deletions schutzbot/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ function retry {

# Variables for where to find osbuild-composer RPMs to test against
DNF_REPO_BASEURL=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com
OSBUILD_COMMIT=376cbffd136bc4ba86fc7c63697fa5b88fe3acef # release 62
OSBUILD_COMPOSER_COMMIT=2d13050ba84a2bb30d9dd980639ee78354fe90f3 # release 59-dev (includes mock openid server fix)
OSBUILD_COMMIT=18c69d2620c785227cdc502677c55d896529d5ee # release 74
OSBUILD_COMPOSER_COMMIT=13fdf04839ff25f4cd61c80a0d046824df0519c5 # release 71

# Get OS details.
source /etc/os-release
Expand Down
2 changes: 1 addition & 1 deletion schutzbot/terraform
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0896913e87404485295bd2d19261fa1a4379971e
04c82e2156dfee54181e10eac317957a8426f091
3 changes: 3 additions & 0 deletions test/container/hub/kojiweb.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ Alias /koji "/usr/share/koji-web/scripts/wsgi_publisher.py"
WSGIDaemonProcess koji lang=C.UTF-8
WSGIProcessGroup koji

# CGImport tends to be slow, let's give the request more time than the default 60 seconds
TimeOut 300

<Directory "/usr/share/koji-web/scripts/">
Options ExecCGI
SetHandler wsgi-script
Expand Down