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

DAOS-16833 cq: update GHA ubuntu #15538

Merged
merged 2 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 3 additions & 3 deletions .github/workflows/ci2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# from scratch, but do not save them.
Build-and-test:
name: Run DAOS/NLT tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
# https://github.com/EnricoMi/publish-unit-test-result-action#permissions
checks: write
Expand All @@ -26,7 +26,7 @@ jobs:
include:
- distro: ubuntu
base: ubuntu
with: ubuntu:mantic
with: ubuntu:oracular
env:
DEPS_JOBS: 10
COMPILER: clang
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:

Build:
name: Build DAOS
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/landing-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# for distros where we only want to build on master and not PRs see the Build-branch job below.
Prepare:
name: Create Docker images
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
max-parallel: 1
Expand All @@ -44,7 +44,7 @@ jobs:
include:
- distro: ubuntu
base: ubuntu
with: ubuntu:mantic
with: ubuntu:oracular
- distro: rocky
base: el.9
with: rockylinux/rockylinux:9
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
Build-and-test:
name: Run DAOS/NLT tests
needs: Prepare
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
# https://github.com/EnricoMi/publish-unit-test-result-action#permissions
checks: write
Expand All @@ -99,7 +99,7 @@ jobs:
include:
- distro: ubuntu
base: ubuntu
with: ubuntu:mantic
with: ubuntu:oracular
env:
DEPS_JOBS: 10
BASE_DISTRO: ${{ matrix.with }}
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
Build:
name: Build DAOS in image
needs: Prepare
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
max-parallel: 2
Expand All @@ -158,7 +158,7 @@ jobs:
include:
- distro: ubuntu
base: ubuntu
with: ubuntu:mantic
with: ubuntu:oracular
- distro: rocky
base: el.9
with: rockylinux/rockylinux:9
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:

Build-branch:
name: Build DAOS
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
include:
- distro: ubuntu
base: ubuntu
with: ubuntu:mantic
with: ubuntu:oracular
- distro: alma.8
base: el.8
with: almalinux:8
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

shell-check:
name: ShellCheck
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -54,7 +54,7 @@ jobs:

log-check:
name: Logging macro checking
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -65,15 +65,15 @@ jobs:

ftest-tags:
name: Ftest tag check
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Check DAOS ftest tags.
run: \[ ! -x src/tests/ftest/tags.py \] || ./src/tests/ftest/tags.py lint --verbose

flake8-lint:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
name: Flake8 check
steps:
- name: Check out source repository
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:

doxygen:
name: Doxygen
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -128,7 +128,7 @@ jobs:

pylint:
name: Pylint check
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -148,7 +148,7 @@ jobs:

codespell:
name: Codespell
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -163,7 +163,7 @@ jobs:

clang-format:
name: Clang Format
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -182,7 +182,7 @@ jobs:

yaml-lint:
name: Yamllint check
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Check out source repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -199,7 +199,7 @@ jobs:

linting-summary:
name: Linting Summary
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- isort
- shell-check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions: {}

jobs:
example_comment_pr:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
pull-requests: write
name: Report Jira data to PR comment
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/version-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ on:
pull_request:
paths:
- 'utils/cq/requirements.txt'
- '.github/workflows/version-checks.yml'

permissions: {}

jobs:
upgrade-check:
name: Check for updates
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion ci/storage/test_main_storage_prepare_node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if ipmctl show -dimm; then
ipmctl show -region
find /dev -name 'pmem*'

daos_server scm $STORAGE_PREP_OPT --force
daos_server scm "${STORAGE_PREP_OPT[@]}" --force

if [ -n "$STORAGE_SCAN" ]; then
# if we don't have pmem here, then we have a problem.
Expand Down
2 changes: 1 addition & 1 deletion ci/unit/test_post_always.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ case $STAGE_NAME in
;;
esac

mkdir -p $test_log_dir
mkdir -p "$test_log_dir"

rsync -v -rlpt -z -e "ssh $SSH_KEY_ARGS" jenkins@"$NODE":build/ .

Expand Down
2 changes: 1 addition & 1 deletion src/tests/ftest/scripts/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ else
rc=0
fi

exit $rc
exit "$rc"
2 changes: 1 addition & 1 deletion utils/scripts/helpers/install_maldet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ printf "LogSyslog yes\n" >> /etc/clamd.d/scan.conf

lmd_tarball='maldetect-current.tar.gz'
: "${REPO_FILE_URL:=https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/}"
lmd_base_url="$(dirname $REPO_FILE_URL)"
lmd_base_url="$(dirname "$REPO_FILE_URL")"
lmd_base="${lmd_base_url#*://}"
lmd_url="${lmd_base_url}/maldetect/downloads/${lmd_tarball}"
curl "${lmd_url}" --silent --show-error --fail -o "/var/tmp/${lmd_tarball}"
Expand Down
Loading