diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-10-01 13:29:15 -0700 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-10-01 22:23:53 +0000 |
| commit | f9279ddaead3440bc96b6838d13f8bcb39328b5a (patch) | |
| tree | 649af1341de921715da29bff24ee1ad7f0d0c7f3 /.gitlab-ci.yml | |
| parent | 58a9b77fb88ce5ef6212bcaa1d41073c533884e9 (diff) | |
GitLab CI: Switch the openSUSE 15.2 image.
Switch to the image in the wireshark/wireshark-containers registry.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dccbf4232f..e37341cf2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,11 +3,10 @@ # Do so in the appropriate Dockerfile at # https://gitlab.com/wireshark/wireshark-containers/ instead. # The resulting images can be found at +# https://gitlab.com/wireshark/wireshark-containers/container_registry # https://hub.docker.com/r/wireshark/wireshark-centos-7-dev -# https://hub.docker.com/r/wireshark/wireshark-centos-8-dev # https://hub.docker.com/r/wireshark/wireshark-debian-stable-dev # https://hub.docker.com/r/wireshark/wireshark-fedora-dev -# https://hub.docker.com/r/wireshark/wireshark-opensuse-15.2-dev # https://hub.docker.com/r/wireshark/wireshark-ubuntu-dev stages: @@ -248,7 +247,7 @@ CentOS 8 RPM Test: openSUSE 15.2 RPM Package: extends: .build-rpm - image: wireshark/wireshark-opensuse-15.2-dev + image: registry.gitlab.com/wireshark/wireshark-containers/opensuse-15.2-dev script: - printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)" - cmake -GNinja .. @@ -256,7 +255,7 @@ openSUSE 15.2 RPM Package: - ninja rpm-package openSUSE 15.2 RPM Test: extends: .test-rpm - image: wireshark/wireshark-opensuse-15.2-dev + image: registry.gitlab.com/wireshark/wireshark-containers/opensuse-15.2-dev script: - zypper --no-gpg-checks --no-remote install -y build/packaging/rpm/RPMS/x86_64/*.rpm - tshark --version |