From 4c923488508e2dac50a8b620edfee05e6e47bbac Mon Sep 17 00:00:00 2001 From: wangyueliang Date: Fri, 28 Jun 2024 10:00:01 +0800 Subject: [PATCH] modify build info for NestOS for Container 22.03LTS_SP4 --- Dockerfile | 2 +- build.sh | 10 +++++----- mantle/kola/tests/ostree/unlock.go | 4 ++-- mantle/kola/tests/rpmostree/deployments.go | 2 +- mantle/kola/tests/rpmostree/rebase.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 510f3232..6bd0ee3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openeuler/openeuler:22.03-lts-sp3 +FROM openeuler-22.03-lts-sp4:latest WORKDIR /root/containerbuild # Keep this Dockerfile idempotent for local development rebuild use cases. diff --git a/build.sh b/build.sh index a0a4130f..cde3fc3f 100755 --- a/build.sh +++ b/build.sh @@ -27,11 +27,11 @@ configure_yum_repos() { # builds. rm -rf /etc/yum.repos.d/* - # Consistent with the base image, current: openeuler 22.03-LTS-SP3 - echo -e "[${version_id}-SP3-NestOS]\nname=NestOS\nenabled=1\nmetadata_expire=1m\nbaseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP3/EPOL/multi_version/NestOS/For-Container/20231231/$arch/\ngpgcheck=0\npriority=2\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp3.repo - echo -e "[${version_id}-SP3-everything]\nname=everything\nenabled=1\nmetadata_expire=1m\nbaseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP3/everything/$arch/\ngpgcheck=0\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp3.repo - echo -e "[${version_id}-SP3-EPOL]\nname=EPOL\nenabled=1\nmetadata_expire=1m\nbaseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP3/EPOL/main/$arch/\ngpgcheck=0\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp3.repo - echo -e "[${version_id}-SP3-extra]\nname=extra\nenabled=1\nmetadata_expire=1m\nbaseurl=http://nestos.org.cn/NestOS-22.03-LTS-SP3/For-Container/20231231/$arch/\ngpgcheck=0\npriority=1\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp3.repo + # Consistent with the base image, current: openeuler 22.03-LTS-SP4 + echo -e "[${version_id}-SP4-NestOS]\nname=NestOS\nenabled=1\nmetadata_expire=1m\nbaseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP4/EPOL/multi_version/NestOS/For-Container/20240628/$arch/\ngpgcheck=0\npriority=2\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp4.repo + echo -e "[${version_id}-SP4-everything]\nname=everything\nenabled=1\nmetadata_expire=1m\nbaseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP4/everything/$arch/\ngpgcheck=0\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp4.repo + echo -e "[${version_id}-SP4-EPOL]\nname=EPOL\nenabled=1\nmetadata_expire=1m\nbaseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP4/EPOL/main/$arch/\ngpgcheck=0\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp4.repo + echo -e "[${version_id}-SP4-extra]\nname=extra\nenabled=1\nmetadata_expire=1m\nbaseurl=https://nestos.org.cn/NestOS-22.03-LTS-SP4/For-Container/20240628/$arch/\ngpgcheck=0\npriority=1\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp4.repo } install_rpms() { diff --git a/mantle/kola/tests/ostree/unlock.go b/mantle/kola/tests/ostree/unlock.go index 5d9fe8bf..22d96a26 100644 --- a/mantle/kola/tests/ostree/unlock.go +++ b/mantle/kola/tests/ostree/unlock.go @@ -33,7 +33,7 @@ func init() { FailFast: true, Tags: []string{"ostree"}, // remove this testcase for iso,becase ro mount 'error: Remounting /sysroot read-write: Permission denied' - ExcludePlatforms: []string{"qemu-iso"}, + // ExcludePlatforms: []string{"qemu-iso"}, }) register.RegisterTest(®ister.Test{ Run: ostreeHotfixTest, @@ -43,7 +43,7 @@ func init() { FailFast: true, Tags: []string{"ostree"}, // remove this testcase for iso,becase ro mount 'error: Remounting /sysroot read-write: Permission denied' - ExcludePlatforms: []string{"qemu-iso"}, + // ExcludePlatforms: []string{"qemu-iso"}, // enable debugging for https://github.com/coreos/fedora-coreos-tracker/issues/942 // we can drop it once we resolved it UserData: conf.Butane(` diff --git a/mantle/kola/tests/rpmostree/deployments.go b/mantle/kola/tests/rpmostree/deployments.go index a0ad130b..ccde47b6 100644 --- a/mantle/kola/tests/rpmostree/deployments.go +++ b/mantle/kola/tests/rpmostree/deployments.go @@ -33,7 +33,7 @@ func init() { FailFast: true, Tags: []string{"rpm-ostree", "upgrade"}, // remove this testcase for iso,becase ro mount 'error: Remounting /sysroot read-write: Permission denied' - ExcludePlatforms: []string{"qemu-iso"}, + // ExcludePlatforms: []string{"qemu-iso"}, }) register.RegisterTest(®ister.Test{ Run: rpmOstreeInstallUninstall, diff --git a/mantle/kola/tests/rpmostree/rebase.go b/mantle/kola/tests/rpmostree/rebase.go index 66cae349..46caf93d 100644 --- a/mantle/kola/tests/rpmostree/rebase.go +++ b/mantle/kola/tests/rpmostree/rebase.go @@ -15,7 +15,7 @@ func init() { Tags: []string{"rpm-ostree", "upgrade"}, Flags: []register.Flag{register.RequiresInternetAccess}, // remove this testcase for iso,becase ro mount 'error: Remounting /sysroot read-write: Permission denied' - ExcludePlatforms: []string{"qemu-iso"}, + // ExcludePlatforms: []string{"qemu-iso"}, }) } -- Gitee