Skip to content

Boot S390 kernels #60

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

Merged
nathanchance merged 4 commits into from
Jan 28, 2021
Merged

Boot S390 kernels #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fa8c09
boot-utils: Update to https://github.com/ClangBuiltLinux/boot-utils/c…
nathanchance Jan 27, 2021
27fc64b
check_logs.py: Add '--use-cbl-qemu' when booting s390
nathanchance Jan 26, 2021
44664e2
generator.yml: Enable s390 booting
nathanchance Jan 26, 2021
99d170c
ci2: Regenerate workflow files
nathanchance Jan 27, 2021
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/5.10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,15 @@ jobs:
name: output_artifact
- name: Boot Test
run: ./check_logs.py
_da824abd4bb76b587a16b3e60ed8bbb4:
_45a3836ec9362ef4ae8a3e3ad370da98:
runs-on: ubuntu-20.04
needs: kick_tuxsuite
name: ARCH=s390 LLVM=0 LLVM_IAS=0 BOOT=0 LLVM 12 defconfig
name: ARCH=s390 LLVM=0 LLVM_IAS=0 BOOT=1 LLVM 12 defconfig
env:
ARCH: s390
LLVM_VERSION: 12
INSTALL_DEPS: 1
BOOT: 0
BOOT: 1
CONFIG: defconfig
steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/mainline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,15 @@ jobs:
name: output_artifact
- name: Boot Test
run: ./check_logs.py
_da824abd4bb76b587a16b3e60ed8bbb4:
_45a3836ec9362ef4ae8a3e3ad370da98:
runs-on: ubuntu-20.04
needs: kick_tuxsuite
name: ARCH=s390 LLVM=0 LLVM_IAS=0 BOOT=0 LLVM 12 defconfig
name: ARCH=s390 LLVM=0 LLVM_IAS=0 BOOT=1 LLVM 12 defconfig
env:
ARCH: s390
LLVM_VERSION: 12
INSTALL_DEPS: 1
BOOT: 0
BOOT: 1
CONFIG: defconfig
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -341,15 +341,15 @@ jobs:
name: output_artifact
- name: Boot Test
run: ./check_logs.py
_f8dea934d87b99f39977257fdd70a9ad:
_4d01af20d416ceae9d53bd9810955298:
runs-on: ubuntu-20.04
needs: kick_tuxsuite
name: ARCH=s390 LLVM=0 LLVM_IAS=0 BOOT=0 LLVM 11 defconfig
name: ARCH=s390 LLVM=0 LLVM_IAS=0 BOOT=1 LLVM 11 defconfig
env:
ARCH: s390
LLVM_VERSION: 11
INSTALL_DEPS: 1
BOOT: 0
BOOT: 1
CONFIG: defconfig
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/next.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,15 @@ jobs:
name: output_artifact
- name: Boot Test
run: ./check_logs.py
_da824abd4bb76b587a16b3e60ed8bbb4:
_45a3836ec9362ef4ae8a3e3ad370da98:
runs-on: ubuntu-20.04
needs: kick_tuxsuite
name: ARCH=s390 LLVM=0 LLVM_IAS=0 BOOT=0 LLVM 12 defconfig
name: ARCH=s390 LLVM=0 LLVM_IAS=0 BOOT=1 LLVM 12 defconfig
env:
ARCH: s390
LLVM_VERSION: 12
INSTALL_DEPS: 1
BOOT: 0
BOOT: 1
CONFIG: defconfig
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion boot-utils
Open in desktop
Submodule boot-utils updated 3 files
+1 −0 .gitignore
+7 −0 README.txt
+16 −0 boot-qemu.sh
9 changes: 6 additions & 3 deletions check_logs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,13 @@ def cwd():
def run_boot():
cbl_arch = get_cbl_name()
kernel_image = cwd() + "/" + get_image_name()
boot_qemu = [
"./boot-utils/boot-qemu.sh", "-a", cbl_arch, "-k", kernel_image
]
if cbl_arch == "s390":
boot_qemu += ["--use-cbl-qemu"]
try:
subprocess.run(
["./boot-utils/boot-qemu.sh", "-a", cbl_arch, "-k", kernel_image],
check=True)
subprocess.run(boot_qemu, check=True)
except subprocess.CalledProcessError as e:
if e.returncode == 124:
print_red("Image failed to boot")
Expand Down
12 changes: 4 additions & 8 deletions generator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ builds:
- {<< : *ppc64le, << : *mainline, << : *llvm, boot: false, llvm_version: *llvm_tot}
# riscv: Boot disabled (https://github.com/ClangBuiltLinux/continuous-integration2/issues/27)
- {<< : *riscv, << : *mainline, << : *riscv_llvm_full, boot: false, llvm_version: *llvm_tot}
# s390: Boot disabled (https://github.com/ClangBuiltLinux/continuous-integration2/issues/42)
- {<< : *s390, << : *mainline, << : *clang, boot: false, llvm_version: *llvm_tot}
- {<< : *s390, << : *mainline, << : *clang, boot: true, llvm_version: *llvm_tot}
- {<< : *x86_64, << : *mainline, << : *llvm_full, boot: true, llvm_version: *llvm_tot}
##########
# Next #
Expand All @@ -124,8 +123,7 @@ builds:
- {<< : *ppc64le, << : *next, << : *llvm, boot: false, llvm_version: *llvm_tot}
# riscv: Boot disabled (https://github.com/ClangBuiltLinux/continuous-integration2/issues/27)
- {<< : *riscv, << : *next, << : *riscv_llvm_full, boot: false, llvm_version: *llvm_tot}
# s390: Boot disabled (https://github.com/ClangBuiltLinux/continuous-integration2/issues/42)
- {<< : *s390, << : *next, << : *clang, boot: false, llvm_version: *llvm_tot}
- {<< : *s390, << : *next, << : *clang, boot: true, llvm_version: *llvm_tot}
- {<< : *x86_64, << : *next, << : *llvm_full, boot: true, llvm_version: *llvm_tot}
############
# 5.10.y #
Expand All @@ -146,8 +144,7 @@ builds:
- {<< : *ppc64le, << : *stable-5_10, << : *llvm, boot: false, llvm_version: *llvm_tot}
# riscv: Boot disabled (https://github.com/ClangBuiltLinux/continuous-integration2/issues/27)
- {<< : *riscv, << : *stable-5_10, << : *riscv_llvm_full, boot: false, llvm_version: *llvm_tot}
# s390: Boot disabled (https://github.com/ClangBuiltLinux/continuous-integration2/issues/42)
- {<< : *s390, << : *stable-5_10, << : *clang, boot: false, llvm_version: *llvm_tot}
- {<< : *s390, << : *stable-5_10, << : *clang, boot: true, llvm_version: *llvm_tot}
- {<< : *x86_64, << : *stable-5_10, << : *llvm_full, boot: true, llvm_version: *llvm_tot}
###########
# 5.4.y #
Expand Down Expand Up @@ -226,6 +223,5 @@ builds:
- {<< : *ppc64le, << : *mainline, << : *llvm, boot: false, llvm_version: *llvm_latest}
# riscv: Boot disabled (https://github.com/ClangBuiltLinux/continuous-integration2/issues/27)
- {<< : *riscv, << : *mainline, << : *riscv_llvm_full, boot: false, llvm_version: *llvm_latest}
# s390: Boot disabled (https://github.com/ClangBuiltLinux/continuous-integration2/issues/42)
- {<< : *s390, << : *mainline, << : *clang, boot: false, llvm_version: *llvm_latest}
- {<< : *s390, << : *mainline, << : *clang, boot: true, llvm_version: *llvm_latest}
- {<< : *x86_64, << : *mainline, << : *llvm_full, boot: true, llvm_version: *llvm_latest}