[PATCH] update ci dockerfile from Leap 15.1 to 15.2

Signed-off-by: Cho, Yu-Chen <acho@suse.com> --- .gitlab-ci.yml | 14 +++++++------- ...e-151.Dockerfile => ci-opensuse-152.Dockerfile} | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename ci/containers/{ci-opensuse-151.Dockerfile => ci-opensuse-152.Dockerfile} (98%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2d5545f0f..30a0b23381 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,10 +160,10 @@ x64-fedora-rawhide-container: variables: NAME: fedora-rawhide -x64-opensuse-151-container: +x64-opensuse-152-container: <<: *container_job_definition variables: - NAME: opensuse-151 + NAME: opensuse-152 x64-ubuntu-1804-container: <<: *container_job_definition @@ -365,12 +365,12 @@ x64-fedora-rawhide-clang: CC: clang RPM: skip -x64-opensuse-151: +x64-opensuse-152: <<: *native_build_job_definition needs: - - x64-opensuse-151-container + - x64-opensuse-152-container variables: - NAME: opensuse-151 + NAME: opensuse-152 RPM: skip x64-ubuntu-1804: @@ -533,9 +533,9 @@ website: codestyle: stage: builds - image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest + image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest needs: - - x64-opensuse-151-container + - x64-opensuse-152-container before_script: - *script_variables script: diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-152.Dockerfile similarity index 98% rename from ci/containers/ci-opensuse-151.Dockerfile rename to ci/containers/ci-opensuse-152.Dockerfile index 9458d2de0c..def45cbe3f 100644 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-152.Dockerfile @@ -3,7 +3,7 @@ # $ lcitool dockerfile opensuse-151 libvirt # # https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... -FROM registry.opensuse.org/opensuse/leap:15.1 +FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ zypper install -y \ -- 2.29.2

On Tue, Jan 05, 2021 at 05:56:13PM +0800, Cho, Yu-Chen wrote:
Signed-off-by: Cho, Yu-Chen <acho@suse.com>
diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-152.Dockerfile similarity index 98% rename from ci/containers/ci-opensuse-151.Dockerfile rename to ci/containers/ci-opensuse-152.Dockerfile index 9458d2de0c..def45cbe3f 100644 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-152.Dockerfile @@ -3,7 +3,7 @@ # $ lcitool dockerfile opensuse-151 libvirt # # https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... -FROM registry.opensuse.org/opensuse/leap:15.1 +FROM registry.opensuse.org/opensuse/leap:15.2
....the comment just above this line says this file is auto-generated and thus should not be manually changed. To update to 15.2 requires changing libvirt-ci.git contents instead. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
participants (2)
-
Cho, Yu-Chen
-
Daniel P. Berrangé