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

0 Add x86/arm64 CI for ohpc on openEuler #2

Merged
merged 18 commits into from
Sep 19, 2022
15 changes: 15 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,18 @@ task:
build_script: |
. /etc/profile.d/lmod.sh
tests/ci/run_build.py ohpc $(tests/ci/cirrus_get_changed_files.sh)

openeuler_task:
name: openEuler on aarch64
arm_container:
image: docker.io/openeuler/openeuler:22.03-lts
cpu: 4
memory: 12G
script: uname -a
setup_script: |
dnf install -y openEuler-release dnf-plugins-core git python3 http://121.36.3.168:82/home:/huangtianhua:/ohpc/standard_aarch64/aarch64/ohpc-release-2-1.oe2203.ohpc.2.0.0.aarch64.rpm findutils rpm-build wget gawk jq which
dnf install -y lmod-ohpc
adduser ohpc
build_script: |
. /etc/profile.d/lmod.sh
tests/ci/run_build.py ohpc $(tests/ci/cirrus_get_changed_files.sh)
14 changes: 13 additions & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Validate

on: [push, pull_request]
on: [pull_request]

jobs:
check_spec:
Expand Down Expand Up @@ -56,6 +56,18 @@ jobs:
zypper -n --no-gpg-checks install http://repos.openhpc.community/OpenHPC/2/Leap_15/x86_64/ohpc-release-2-1.leap15.x86_64.rpm
zypper -n --no-gpg-checks install lmod-ohpc
useradd -m ohpc

build_on_openEuler:
runs-on: ubuntu-latest
container:
image: docker.io/openeuler/openeuler:22.03-lts
steps:
- name: Setup
run: |
dnf install -y http://121.36.3.168:82/home:/huangtianhua:/ohpc/standard_x86_64/x86_64/ohpc-release-2-1.oe2203.ohpc.2.0.0.x86_64.rpm openEuler-release dnf-plugins-core git python3 findutils rpm-build wget gawk

yum install -y lmod-ohpc
adduser ohpc
- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand Down
3 changes: 2 additions & 1 deletion components/admin/lmod/SPECS/lmod.spec
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ BuildRequires: tcl tcl-devel
Requires: tcl
BuildRequires: lua-devel
BuildRequires: rsync
BuildRequires: gcc-c++ make

%if 0%{?suse_version} || 0%{?sle_version}
BuildRequires: lua-luafilesystem
Expand All @@ -38,7 +39,7 @@ Requires: lua-luafilesystem
Requires: lua-luaposix
Conflicts: Modules
%else
# If not SUSE, assume Fedora-based OS
# If not SUSE, assume Fedora-based OS or openEuler
BuildRequires: lua-libs
BuildRequires: lua-filesystem
BuildRequires: lua-posix
Expand Down
4 changes: 2 additions & 2 deletions tests/ci/run_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

for row in reader:
key = row.pop('NAME')
if key == 'ID_LIKE':
if key in ['ID_LIKE', 'ID']:
for item in list(row.items())[0]:
if 'fedora' in item:
if 'fedora' in item or 'openEuler' in item:
dnf_based = True


Expand Down