From 7fa8c094dac68eaa2f5b719c42ce9f695ae1e410 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Wed, 27 Jan 2021 15:53:59 -0700 Subject: [PATCH 1/4] boot-utils: Update to https://github.com/ClangBuiltLinux/boot-utils/commit/0c3d7084d7fab2f5f498a3cb1851c273a5e0401c Signed-off-by: Nathan Chancellor --- boot-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot-utils b/boot-utils index 5ecf8614..0c3d7084 160000 --- a/boot-utils +++ b/boot-utils @@ -1 +1 @@ -Subproject commit 5ecf86143c56f8dae6a57be6ec3533f96263037a +Subproject commit 0c3d7084d7fab2f5f498a3cb1851c273a5e0401c From 27fc64b57a7ce23d68db413a3f7f26d51de4bbc9 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Tue, 26 Jan 2021 16:45:21 -0700 Subject: [PATCH 2/4] check_logs.py: Add '--use-cbl-qemu' when booting s390 This will use the copy of qemu-system-s390x that we now have in qemu-binaries, which is required for booting clang built s390 kernels. Signed-off-by: Nathan Chancellor --- check_logs.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/check_logs.py b/check_logs.py index 97a8ac17..d21eaacd 100755 --- a/check_logs.py +++ b/check_logs.py @@ -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") From 44664e2af23b34808ebfd045a61d8941b17880d4 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Tue, 26 Jan 2021 16:45:25 -0700 Subject: [PATCH 3/4] generator.yml: Enable s390 booting Now that boot-utils can use a working copy of qemu-system-s390x, use it. Signed-off-by: Nathan Chancellor --- generator.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/generator.yml b/generator.yml index 7e5e1b71..ef4536b1 100644 --- a/generator.yml +++ b/generator.yml @@ -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 # @@ -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 # @@ -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 # @@ -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} From 99d170cd85ca53bf8ecdf3d3a30f790a8a18e77d Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Wed, 27 Jan 2021 15:59:39 -0700 Subject: [PATCH 4/4] ci2: Regenerate workflow files Signed-off-by: Nathan Chancellor --- .github/workflows/5.10.yml | 6 +++--- .github/workflows/mainline.yml | 12 ++++++------ .github/workflows/next.yml | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/5.10.yml b/.github/workflows/5.10.yml index bfa59d90..c828b2d5 100644 --- a/.github/workflows/5.10.yml +++ b/.github/workflows/5.10.yml @@ -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 diff --git a/.github/workflows/mainline.yml b/.github/workflows/mainline.yml index 295b28f7..f97686b8 100644 --- a/.github/workflows/mainline.yml +++ b/.github/workflows/mainline.yml @@ -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 @@ -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 diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml index cb3a91d6..e0d5c88b 100644 --- a/.github/workflows/next.yml +++ b/.github/workflows/next.yml @@ -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