Line 46: |
Line 46: |
| | | |
| </syntaxhighlight> | | </syntaxhighlight> |
− |
| |
− |
| |
| | | |
| Check that you can connect<syntaxhighlight lang="bash"> | | Check that you can connect<syntaxhighlight lang="bash"> |
Line 55: |
Line 53: |
| === Build from git === | | === Build from git === |
| For now, this is the only way we can do a build from git on koji, but in the future this will be incorporated into the 'make build'. <syntaxhighlight lang="bash"> | | For now, this is the only way we can do a build from git on koji, but in the future this will be incorporated into the 'make build'. <syntaxhighlight lang="bash"> |
− | koji build dist-sme<ver>-<target> git+https://src.koozali.org/<org>/<pkg>.git?#<tag> | + | koji build sme11-test git+https://src.koozali.org/smeserver/<pkg>.git?#<tag> |
| + | koji build sme11-contribs-test git+https://src.koozali.org/smecontribs/<pkg>.git?#<tag> |
| </syntaxhighlight>Where: | | </syntaxhighlight>Where: |
| | | |
− | * <ver> = 10,11 or 12
| |
− | * <target> = os or contribs
| |
− | * <org> = smeserver or smecontribs
| |
| * <pkg> = your package (e.g. smeserver-php) | | * <pkg> = your package (e.g. smeserver-php) |
− | * <tag> = version tag to be built (3.0-1) | + | * <tag> = version tag to be built (3_0-1) |
| + | |
| Example:<syntaxhighlight lang="bash"> | | Example:<syntaxhighlight lang="bash"> |
− | koji build dist-sme11-os git+https://src.koozali.org/smeserver/daemontools.git?#0.76-6 | + | koji build sme11-test git+https://src.koozali.org/smeserver/smeserver-php.git?#3_0-1 |
| </syntaxhighlight> | | </syntaxhighlight> |
| + | |
| + | == Structure == |
| + | We have created build targets that align with the standard development practice of building into test, then migrating that build through the different environments |
| + | |
| + | * smeserver/<pkg>-<tag> -> sme11-test (dist-sme11-os-testing) -> dist-sme11-updates-testing -> dist-sme11-updates |
| + | * smecontribs/<pkg>-<tag> -> sme11-contribs-test (dist-sme11-contribs-testing) -> dist-sme11-contribs |
| + | {{Note box|There is a target of sme11-os that will build into dist-sme11-os, but this should ONLY be used for tthe initial load of the smeos repository}} |
| + | The repos align with the repos available to dnf in smeserver: |
| + | |
| + | * smeos (dist-sme11-os) |
| + | * smetest (dist-sme11-os-test) |
| + | * smeupdates-test (dist-sme11-updates-testing) |
| + | * smeupdates (dist-sme11-updates) |
| + | * smecontribs-test (dist-sme11-contribs-testing) |
| + | * smecontribs (dist-sme11-contribs) |
| | | |
| == Advanced commands == | | == Advanced commands == |
| to add a rpm to the base rpm to install in a mock environment : | | to add a rpm to the base rpm to install in a mock environment : |
| | | |
− | koji add-group-pkg dist-sme11-os-build build perl-Module-Install
| + | koji add-group-pkg dist-sme11-build build perl-Module-Install |
| | | |
| to list rpms in the mock environment: | | to list rpms in the mock environment: |
| | | |
− | koji list-groups dist-sme11-os-build build | + | koji list-groups dist-sme11-build build |
| | | |
| to add a package to build list | | to add a package to build list |