From 0e65206785315a5b62adf015d046e9a33be26d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 22 Aug 2023 09:13:52 +0100 Subject: [PATCH 1/2] Remove references to the deprecated YaST:Head:Agama project --- README.md | 15 ++++++++------- deploy.sh | 20 -------------------- doc/testing_using_container.md | 6 +++--- playwright/README.md | 8 ++++---- rust/README.md | 17 ++--------------- rust/agama-cli/doc/backend-for-testing.md | 12 +++++------- 6 files changed, 22 insertions(+), 56 deletions(-) delete mode 100755 deploy.sh diff --git a/README.md b/README.md index f9fc60df13..15f9c4fba0 100644 --- a/README.md +++ b/README.md @@ -114,12 +114,13 @@ The easiest way to give Agama a try is to grab a live ISO image and boot it in a machine. This is also the recommended way if you only want to play and see it in action. If you want to have a closer look, then clone and configure the project as explained in the next section. -* [multi-product](https://build.opensuse.org/package/binaries/YaST:Head:Agama/agama-live:default/images): - it can be used to install different products, like *openSUSE Tumbleweed*, *Leap*, *Leap Micro* or - an experimental version of the *SUSE ALP ContainerHost OS*. -* [ALP only](https://build.opensuse.org/package/binaries/YaST:Head:Agama/agama-live:ALP/images): - it only contains the definition for the experimental *SUSE ALP ContainerHost OS*, although - the rest of the content is pretty much the same than the multi-product version. +There are two flavors of live ISO images: + +* openSUSE: it can be used to install different *openSUSE* distributions, like *Tumbleweed* or *Leap*. +* ALP: it allows to install the development version of *SUSE ALP Dolomite*. + +You can download them from the [openSUSE Build +Service](https://download.opensuse.org/repositories/systemsmanagement:/Agama:/Devel/images/iso/). ### Manual Configuration @@ -145,7 +146,7 @@ web/README.md#using-a-development-server). Another alternative is to run source checkout inside container so system is not affected by doing testing run beside real actions really done by installer. -See more details [in the documentation][doc/testing_using_container.md]. +See more details [in the documentation](doc/testing_using_container.md). * Start the services: * beware that Agama must run as root (like YaST does) to do diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 4f11f68fcf..0000000000 --- a/deploy.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# This script is supposed to be used in an openSUSE Tumbleweed Live DVD. - -sudo rpm --import https://build.opensuse.org/projects/YaST/public_key -sudo zypper ar -f \ - https://download.opensuse.org/repositories/YaST:/Head:/Agama/openSUSE_Tumbleweed/YaST:Head:Agama.repo -RUBY_VERSION=ruby:$(rpm --eval '%{rb_ver}') -sudo zypper --non-interactive in --no-recommends \ - "rubygem($RUBY_VERSION:agama)" \ - cockpit-agama \ - cockpit - -sudo systemctl start cockpit -sudo systemctl start agama - -# set 'linux' as password -echo "linux:Nk1RhI1GqlxdA" | sudo chpasswd -e linux - -xdg-open http://localhost:9090/cockpit/@localhost/agama/index.html diff --git a/doc/testing_using_container.md b/doc/testing_using_container.md index e21d8ef68c..06a697a54a 100644 --- a/doc/testing_using_container.md +++ b/doc/testing_using_container.md @@ -1,14 +1,14 @@ ## Testing Using Container -To test complex change that affects multiple parts of agama it is possible to +To test complex change that affects multiple parts of Agama it is possible to run from sources using container that is used to run CI. Below is shell script that start container, provides web UI on port 9090 and also gives root access to container for more testing. ```sh -# https://build.opensuse.org/package/show/YaST:Head:Containers/agama-testing -CIMAGE=registry.opensuse.org/yast/head/containers/containers_tumbleweed/opensuse/agama-testing:latest +# https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama-testing +CIMAGE=registry.opensuse.org/systemsmanagement/agama/staging/containers/opensuse/agama-testing:latest # rename this if you test multiple things CNAME=agama # the '?' here will report a shell error diff --git a/playwright/README.md b/playwright/README.md index e3132df175..0a44245d4a 100644 --- a/playwright/README.md +++ b/playwright/README.md @@ -14,7 +14,7 @@ npm install --no-save @playwright/test This will install the NPM packages into the `node_modules` subdirectory. Alternatively you can install it as an RPM package from the -[YaST:Head:Agama](https://build.opensuse.org/project/show/YaST:Head:Agama) +[systemsmanagement:Agama:Staging](https://build.opensuse.org/project/show/systemsmanagement:Agama:Staging) OBS project. ## Files @@ -57,8 +57,8 @@ See the `playwright.config.ts` file for the list of configured projects. ### Running Tests Directly from the Live ISO -You can download the `default-Playwright` image type from the [YaST:Head:Agama]( -https://download.opensuse.org/repositories/YaST:/Head:/Agama/images/iso/) repository. +You can download the `default-Playwright` image type from the [systemsmanagement:Agama:Staging]( +https://download.opensuse.org/repositories/systemsmanagement:/Agama:/Staging/images/iso/) repository. This ISO additionally includes the Playwright tool, Chromium browser and the Agama integration tests. @@ -229,5 +229,5 @@ Additional help can be the `y2log` file in the artifacts (see above). ### Missing Package/Wrong Container -Packages lives in container at https://build.opensuse.org/package/show/YaST:Head:Containers/agama-testing . +Packages lives in container at https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama-testing. Feel free to modify it as the only purpose of this container is CI testing. diff --git a/rust/README.md b/rust/README.md index df265fef77..4383017a0e 100644 --- a/rust/README.md +++ b/rust/README.md @@ -32,8 +32,8 @@ Agama D-Bus API is also a work in progress, but it is already used by Agama. ## Installation -You can grab the [RPM package](https://build.opensuse.org/package/show/YaST:Head:Agama/agama-cli) from -the [YaST:Head:Agama](https://build.opensuse.org/project/show/YaST:Head:Agama) project. +You can grab the [RPM package](https://build.opensuse.org/package/show/systemsmanagement:Agama:Devel/agama-cli) from +the [systemsmanagement:Agama:Devel](https://build.opensuse.org/project/show/systemsmanagement:Agama:Devel) project. If you prefer, you can install it from sources with [Cargo](https://doc.rust-lang.org/cargo/): @@ -112,17 +112,4 @@ frontend](./agama-cli/doc/backend-for-testing.md)*. * If no product is selected, the `probe` command fails. -## Packaging - -Packaging files live in the `package' directory. Agama follows the -[Rust packaging guidelines](https://en.opensuse.org/openSUSE:Packaging_Rust_Software). -To test changes to the spec file, use a simple `osc branch YaST:Head:Agama agama-cli`. -and copy the modified spec file to that branch. -If it also needs specific code from a git branch, then modify `_service' file and -put the git branch name in the `` tag. Then run `osc service runall`. - -Note: for openSUSE Leap, `cargo_audit` [does not work][c_a_bug] with older Python, so comment out that -service section for the test build. -For the test build, use the usual `osc build' on modified sources. - [c_a_bug]: https://github.com/openSUSE/obs-service-cargo_audit/pull/6 diff --git a/rust/agama-cli/doc/backend-for-testing.md b/rust/agama-cli/doc/backend-for-testing.md index 867661a94b..41c34529a6 100644 --- a/rust/agama-cli/doc/backend-for-testing.md +++ b/rust/agama-cli/doc/backend-for-testing.md @@ -17,18 +17,16 @@ My first plan had a different finale, 4. Make the D-Bus service visible ouside the container, but I hit an issue with D-Bus authentication, hopefully solvable. (Update: `xdg-dbus-proxy` seems to work, ask mvidner about it) -Josef wanted to test against a different container ([d-installer-backend][]) but that one was a +Josef wanted to test against a different container (`d-installer-backend`) but that one was a bit old and the D-Bus API was mismatched between frontend and backend. -[d-installer-backend]: https://build.opensuse.org/package/show/YaST:Head:Containers/d-installer-backend - ## Details The container used is built in -[OBS YaST:Head:Containers/agama-testing][agama-testing] and +[OBS systemsmanagement:Agama:Staging/agama-testing][agama-testing] and downloaded from registry.o.o specified below. -[agama-testing]: https://build.opensuse.org/package/show/YaST:Head:Containers/agama-testing +[agama-testing]: https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama-testing I basically picked the useful bits from the `integration-tests` part of [.github/workflows/ci.yml][ci.yml]. @@ -37,8 +35,8 @@ of [.github/workflows/ci.yml][ci.yml]. ```sh -# https://build.opensuse.org/package/show/YaST:Head:Containers/agama-testing -CIMAGE=registry.opensuse.org/yast/head/containers/containers_tumbleweed/opensuse/agama-testing:latest +# https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama-testing +CIMAGE=registry.opensuse.org/systemsmanagement/agama/staging/containers/opensuse/agama-testing:latest # rename this if you test multiple things CNAME=agama # the '?' here will report a shell error From 59091ff7508627144997f8023be5af1a5ed73c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 22 Aug 2023 09:50:15 +0100 Subject: [PATCH 2/2] Use the agama-testing containers for staging in the CI --- .github/workflows/ci-integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integration-tests.yml b/.github/workflows/ci-integration-tests.yml index 6f03cbef78..7f7fdf87cb 100644 --- a/.github/workflows/ci-integration-tests.yml +++ b/.github/workflows/ci-integration-tests.yml @@ -102,7 +102,7 @@ jobs: run: mkdir -p /tmp/log/YaST2 - name: Start container - run: podman run --privileged --detach --name agama --ipc=host -e CI -e GITHUB_ACTIONS -v /dev:/dev -v .:/checkout -v /tmp/log/YaST2:/var/log/YaST2 registry.opensuse.org/yast/head/containers/containers_tumbleweed/opensuse/agama-testing:latest + run: podman run --privileged --detach --name agama --ipc=host -e CI -e GITHUB_ACTIONS -v /dev:/dev -v .:/checkout -v /tmp/log/YaST2:/var/log/YaST2 registry.opensuse.org/systemsmanagement/agama/staging/containers/opensuse/agama-testing:latest - name: Environment run: podman exec agama bash -c "env | sort"