Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed broken integration test, the setup-service.sh script has been renamed to setup-services.sh #920

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Fixed broken integration test, the setup-service.sh script has been renamed to setup-services.sh #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea7ec4f
The setup-service.sh script has been renamed to setup-services.sh
lslezak Dec 8, 2023
169afc9
install the s390 packages conditionally
lslezak Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ jobs:
- name: Install the frontend
run: podman exec agama bash -c "ln -snfv /checkout/web/dist /usr/share/cockpit/agama"

# ./setup-service.sh will try setting up cockpit.socket
# ./setup-services.sh will try setting up cockpit.socket
# which has a login page, so this local-session needs to be first
- name: Start Cockpit service
run: podman exec --detach agama /usr/libexec/cockpit-ws --local-session=/usr/bin/cockpit-bridge

- name: Setup service
run: podman exec agama bash -c "cd /checkout; ./setup-service.sh"
run: podman exec agama bash -c "cd /checkout; ./setup-services.sh"

- name: Set a testing Agama configuration
# use just one product, it skips the product selection at the beginning
Expand Down
2 changes: 1 addition & 1 deletion rust/agama-cli/doc/backend-for-testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ podman run --name ${CNAME?} \
# shortcut for the following
CEXEC="podman exec ${CNAME?} bash -c"

${CEXEC?} "cd /checkout && ./setup-service.sh"
${CEXEC?} "cd /checkout && ./setup-services.sh"

# Optional: explicit service start using a separate log file
${CEXEC?} "cd /checkout/service && (bundle exec bin/agamactl > service.log 2>&1 &)"
Expand Down
2 changes: 1 addition & 1 deletion service/bin/agamactl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ if ARGV.empty?
puts "ERROR: Using 'agamactl' to start all services no longer works."
puts "NOTE: It had race conditions all along and now there's a Rust service it can't reach too."
puts "NOTE: Use `systemctl start agama.service` instead"
puts "NOTE: which is setup by a) RPMs b) ./setup-service.sh"
puts "NOTE: which is setup by a) RPMs b) ./setup-services.sh"
exit 1
elsif ["-h", "--help"].include?(ARGV[0])
me = $PROGRAM_NAME
Expand Down
12 changes: 7 additions & 5 deletions setup-services.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@ $SUDO zypper --non-interactive --gpg-auto-import-keys install \
udftools \
xfsprogs || exit 1

# Install s390 packages (do not exit on failure).
$SUDO zypper --non-interactive --gpg-auto-import-keys install \
yast2-s390 \
yast2-reipl \
yast2-cio
# Install s390 packages
if [ $(uname -m) == "s390x" ]; then
$SUDO zypper --non-interactive --gpg-auto-import-keys install \
yast2-s390 \
yast2-reipl \
yast2-cio
fi

# Rubygem dependencies
(
Expand Down