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.

Sign up for GitHub

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

workflows: Move to Ubuntu 24.04 #633

Merged
merged 2 commits into from
Dec 13, 2024
Merged

workflows: Move to Ubuntu 24.04 #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de95a7b
tasks: Mark OpenSSL basicConstraints extension as critical
martinpitt Dec 13, 2024
e083f43
workflows: Move to Ubuntu 24.04
martinpitt Dec 13, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build-tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
build:
- label: amd64
runner: ubuntu-22.04
runner: ubuntu-24.04
- label: arm64
runner: buildjet-2vcpu-ubuntu-2204-arm

Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
manifest:
needs: build

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5

steps:
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: tests
on: [pull_request]
jobs:
unit-tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Clone repository
uses: actions/checkout@v4
Expand All @@ -11,14 +11,13 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y make python3-pyflakes python3-pycodestyle python3-pip python3-pytest
# `pip install .[test]` does not work properly on Ubuntu 22.04
sudo pip install ruff mypy types-PyYAML
sudo pip install .[test]

- name: Run lint tests
run: make check

tasks:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
# enough permissions for tests-scan to work
pull-requests: read
Expand All @@ -42,14 +41,6 @@ jobs:
sudo apt-get update
sudo apt-get install -y make python3-pytest

# HACK: Ubuntu 22.04 has podman 3.4, which isn't compatible with podman-remote 4 in our tasks container
# This PPA is a backport of podman 4.3 from Debian 12; drop this when moving `runs-on:` to ubuntu-24.04
- name: Update to newer podman
run: |
sudo add-apt-repository -y ppa:quarckster/containers
sudo apt install -y podman
systemctl --user daemon-reload

- name: Check which containers changed
id: containers_changed
run: |
Expand Down
8 changes: 4 additions & 4 deletions tasks/credentials/openssl.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ organizationalUnitName = optional
domainComponent = optional

[ certificate_extensions ]
basicConstraints = CA:false
basicConstraints = critical, CA:false

[ req ]
default_bits = 2048
Expand All @@ -39,16 +39,16 @@ x509_extensions = root_ca_extensions
commonName = hostname

[ root_ca_extensions ]
basicConstraints = CA:true
basicConstraints = critical, CA:true
keyUsage = keyCertSign, cRLSign

[ client_ca_extensions ]
basicConstraints = CA:false
basicConstraints = critical, CA:false
keyUsage = digitalSignature,keyEncipherment
extendedKeyUsage = 1.3.6.1.5.5.7.3.2

[ server_ca_extensions ]
basicConstraints = CA:false
basicConstraints = critical, CA:false
keyUsage = digitalSignature,keyEncipherment
extendedKeyUsage = 1.3.6.1.5.5.7.3.1
subjectAltName=DNS:*.apps.ocp.ci.centos.org,DNS:*.cockpit-project.org,DNS:cockpit-tests,DNS:cockpituous,DNS:*.compute-1.amazonaws.com,DNS:localhost,DNS:localhost.localdomain