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.

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

Add saline server container #9451

Merged

Conversation

vzhestkov
Copy link
Contributor

@vzhestkov vzhestkov commented Nov 8, 2024

What does this PR change?

Adds server container with Saline inside.

GUI diff

No difference.

Before:

After:

  • DONE

Documentation

Test coverage

ℹ️ If a major new functionality is added, it is strongly recommended that tests for the new functionality are added to the Cucumber test suite

  • No tests: add explanation

  • No tests: already covered

  • Unit tests were added

  • Cucumber tests were added

  • DONE

Links

Issue(s): #
Port(s): # add downstream PR(s), if any

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "java_pgsql_tests"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"
  • Re-run test "javascript_lint"
  • Re-run test "spacecmd_unittests"

Before you merge

Check How to branch and merge properly!

@vzhestkov vzhestkov requested a review from a team as a code owner November 8, 2024 12:58
@vzhestkov vzhestkov force-pushed the add-saline-server-container branch 3 times, most recently from 089cbf5 to be0bf41 Compare November 15, 2024 10:22
containers/server-saline-image/Dockerfile Outdated Show resolved Hide resolved
containers/server-saline-image/Dockerfile Outdated Show resolved Hide resolved
containers/server-saline-image/Dockerfile Outdated Show resolved Hide resolved
rel-eng/packages/server-saline-image Outdated Show resolved Hide resolved
@vzhestkov vzhestkov force-pushed the add-saline-server-container branch from be0bf41 to 8af40f9 Compare November 15, 2024 12:09
@vzhestkov vzhestkov force-pushed the add-saline-server-container branch from 8af40f9 to fa4069f Compare November 15, 2024 12:46
Copy link
Contributor

@szachovy szachovy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

optional

containers/server-saline-image/Dockerfile Show resolved Hide resolved
containers/server-saline-image/Dockerfile Show resolved Hide resolved
containers/server-saline-image/Dockerfile Show resolved Hide resolved
containers/server-saline-image/Dockerfile Show resolved Hide resolved
containers/server-saline-image/Dockerfile Outdated Show resolved Hide resolved
containers/server-saline-image/Dockerfile Outdated Show resolved Hide resolved
containers/server-saline-image/Dockerfile Outdated Show resolved Hide resolved
containers/server-saline-image/cleanup.sh Outdated Show resolved Hide resolved
containers/server-saline-image/run_saline.sh Outdated Show resolved Hide resolved
containers/server-saline-image/run_saline.sh Show resolved Hide resolved
@deneb-alpha
Copy link
Contributor

@vzhestkov did you try to build the container pushing it to OBS?
I'm getting this:

build-packages-for-obs server-saline-image
server-saline-image
Going to build new obs packages in /tmp/push-packages-to-obs/SRPMS...
=== Building package [server-saline-image-5.1.0] from containers/server-saline-image/ (Try 1)
ERROR: Error running command: rpmbuild --define "_source_filedigest_algorithm md5"  --define "_binary_filedigest_algorithm md5"  --eval '%undefine scl' --define "_topdir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-image9c83uqka" --define "_sourcedir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-image9c83uqka/SOURCES" --define "_builddir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-image9c83uqka/BUILD" --define "_srcrpmdir /tmp/push-packages-to-obs/SRPMBUILD" --define "_rpmdir /tmp/push-packages-to-obs/SRPMBUILD"   --nodeps -bs /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-image9c83uqka/SOURCES/server-saline-image-git-0.fa4069f/Dockerfile

Status code: 1

Command output: ['error: line 4: Unknown tag: ARG BASE=registry.suse.com/bci/bci-base:15.6', '']

Creating output directory: /tmp/push-packages-to-obs/SRPMBUILD
Building package [server-saline-image-5.1.0-5.1.0]
Wrote: /tmp/push-packages-to-obs/SRPMBUILD/server-saline-image-git-0.fa4069f.tar.gz
error: line 4: Unknown tag: ARG BASE=registry.suse.com/bci/bci-base:15.6



Traceback (most recent call last):
  File "/usr/bin/tito", line 23, in <module>
    CLI().main(sys.argv[1:])
  File "/usr/lib64/python3.6/site-packages/tito/cli.py", line 206, in main
    return module.main(argv)
  File "/usr/lib64/python3.6/site-packages/tito/cli.py", line 381, in main
    return builder.run(self.options)
  File "/usr/lib64/python3.6/site-packages/tito/builder/main.py", line 153, in run
    self.srpm()
  File "/usr/lib64/python3.6/site-packages/tito/builder/main.py", line 229, in srpm
    output = run_command_func(cmd)
  File "/usr/lib64/python3.6/site-packages/tito/common.py", line 468, in run_command_print
    raise RunCommandException(command, status, "\n".join(output))
tito.exception.RunCommandException: Error running command: rpmbuild --define "_source_filedigest_algorithm md5"  --define "_binary_filedigest_algorithm md5"  --eval '%undefine scl' --define "_topdir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-image9c83uqka" --define "_sourcedir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-image9c83uqka/SOURCES" --define "_builddir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-image9c83uqka/BUILD" --define "_srcrpmdir /tmp/push-packages-to-obs/SRPMBUILD" --define "_rpmdir /tmp/push-packages-to-obs/SRPMBUILD"   --nodeps -bs /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-image9c83uqka/SOURCES/server-saline-image-git-0.fa4069f/Dockerfile
=== Building package [server-saline-image-5.1.0] from containers/server-saline-image/ (Try 2)
ERROR: Error running command: rpmbuild --define "_source_filedigest_algorithm md5"  --define "_binary_filedigest_algorithm md5"  --eval '%undefine scl' --define "_topdir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-imagecuxfv399" --define "_sourcedir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-imagecuxfv399/SOURCES" --define "_builddir /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-imagecuxfv399/BUILD" --define "_srcrpmdir /tmp/push-packages-to-obs/SRPMBUILD" --define "_rpmdir /tmp/push-packages-to-obs/SRPMBUILD"   --nodeps -bs /tmp/push-packages-to-obs/SRPMBUILD/rpmbuild-server-saline-imagecuxfv399/SOURCES/server-saline-image-git-0.fa4069f/Dockerfile

Status code: 1

@vzhestkov vzhestkov force-pushed the add-saline-server-container branch from fa4069f to 7458014 Compare November 29, 2024 10:30
@vzhestkov
Copy link
Contributor Author

@vzhestkov vzhestkov requested a review from szachovy November 29, 2024 11:17
@deneb-alpha
Copy link
Contributor

deneb-alpha commented Nov 29, 2024

@deneb-alpha , I'm testing it here: https://build.opensuse.org/package/show/home:vizhestkov:saline-images-uyuni-master/server-saline-image

Are you pushing it using the automation or manually?
The content of the PR looks a bit different for instance

@vzhestkov
Copy link
Contributor Author

@deneb-alpha , manually, as I know nothing about the automation for it.
The difference I see only in Dockerfile:

-#!BuildTag: uyuni/server-saline:latest
+#!BuildTag: uyuni/server-saline:2024.10 uyuni/server-saline:2024.10.%RELEASE% uyuni/server-saline:latest

Do we have any description how new containers should be submitted?

szachovy
szachovy previously approved these changes Nov 30, 2024
@deneb-alpha
Copy link
Contributor

@deneb-alpha , manually, as I know nothing about the automation for it. The difference I see only in Dockerfile:

-#!BuildTag: uyuni/server-saline:latest
+#!BuildTag: uyuni/server-saline:2024.10 uyuni/server-saline:2024.10.%RELEASE% uyuni/server-saline:latest

Do we have any description how new containers should be submitted?

you can submit to a test IBS/OBS project with https://github.com/uyuni-project/uyuni/wiki/Building-an-RPM-in-an-OBS-branch-package

In particular, I think in this case we will need a regular .changes instead of the one generated automatically by mkchglog. No need to add the full .changes template with author, date etc, but I think we need one for pushing to IBS/OBS.
Last but not least, in that case the changelog test will fail because you are editing the main .changes, but in this case the error is expected.

@vzhestkov
Copy link
Contributor Author

@deneb-alpha done, thanks for pointing

@vzhestkov vzhestkov requested a review from szachovy December 3, 2024 09:04
szachovy
szachovy previously approved these changes Dec 4, 2024
Copy link
Contributor

@deneb-alpha deneb-alpha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @vzhestkov
I prepared a PR with the needed fixes for this PR.

With the changes I proposed in this pull request (vzhestkov#1) the automation is working and the container can be pushed and tagged automatically.

Copy link
Contributor

@deneb-alpha deneb-alpha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vzhestkov from releng POV, LGTM

@vzhestkov vzhestkov merged commit 849b93c into uyuni-project:master Dec 7, 2024
16 of 17 checks passed
Copy link
Contributor

github-actions bot commented Dec 7, 2024

⚠️ Some changelog tests have failed. @vzhestkov, please review and fix the changelog issues with an additional PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants