open-build-service merge requestshttps://gitlab.collabora.com/obs/open-build-service/-/merge_requests2022-06-23T15:22:55Zhttps://gitlab.collabora.com/obs/open-build-service/-/merge_requests/34staging -> production: Aptly fixes and improvements2022-06-23T15:22:55ZAriel D'Alessandroariel.dalessandro@collabora.comstaging -> production: Aptly fixes and improvementsTask https://phabricator.apertis.org/T8672Task https://phabricator.apertis.org/T8672Ariel D'Alessandroariel.dalessandro@collabora.comAriel D'Alessandroariel.dalessandro@collabora.comhttps://gitlab.collabora.com/obs/open-build-service/-/merge_requests/33bs_published_hook_aptly_snapshot: Create relative path symlink2022-06-17T15:11:32ZAriel D'Alessandroariel.dalessandro@collabora.combs_published_hook_aptly_snapshot: Create relative path symlinkIn order to rsync this properly, the symlink needs to be relative,
otherwise it's not found.In order to rsync this properly, the symlink needs to be relative,
otherwise it's not found.Ariel D'Alessandroariel.dalessandro@collabora.comAriel D'Alessandroariel.dalessandro@collabora.comhttps://gitlab.collabora.com/obs/open-build-service/-/merge_requests/31aptly: Change snapshot distro/prefix to match reprepro2022-06-16T07:05:56ZAriel D'Alessandroariel.dalessandro@collabora.comaptly: Change snapshot distro/prefix to match repreproTask https://phabricator.apertis.org/T8672
aptly: Change snapshot distro/prefix to match reprepro
Reprepro was setting the snapshot Codename (a.k.a. Suite) to
snapshots/$distro/$timestamp. Let's use the same convention for
compatab...Task https://phabricator.apertis.org/T8672
aptly: Change snapshot distro/prefix to match reprepro
Reprepro was setting the snapshot Codename (a.k.a. Suite) to
snapshots/$distro/$timestamp. Let's use the same convention for
compatability.https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/32backend: Install collabora aptly fork2022-06-16T06:36:04ZAriel D'Alessandroariel.dalessandro@collabora.combackend: Install collabora aptly forkTask https://phabricator.apertis.org/T8672
The required aptly version includes custom collabora patches. Install
it instead of the upstream version.Task https://phabricator.apertis.org/T8672
The required aptly version includes custom collabora patches. Install
it instead of the upstream version.Ariel D'Alessandroariel.dalessandro@collabora.comAriel D'Alessandroariel.dalessandro@collabora.comhttps://gitlab.collabora.com/obs/open-build-service/-/merge_requests/30aptly: Add missing gpg-key on repo publish update2022-06-14T04:50:29ZAriel D'Alessandroariel.dalessandro@collabora.comaptly: Add missing gpg-key on repo publish updateTask https://phabricator.apertis.org/T8672
The gpg-key needs to be passed as an argument when a repository is
re-published. This is now missing, so the wrong gpg-key is being used.Task https://phabricator.apertis.org/T8672
The gpg-key needs to be passed as an argument when a repository is
re-published. This is now missing, so the wrong gpg-key is being used.https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/29Draft: aptly: Improvements on repo pkgs performance2022-06-10T12:40:29ZAriel D'Alessandroariel.dalessandro@collabora.comDraft: aptly: Improvements on repo pkgs performanceTask https://phabricator.apertis.org/T8672Task https://phabricator.apertis.org/T8672https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/28aptly: Add missing source architecture during publishing2022-06-10T12:40:28ZAriel D'Alessandroariel.dalessandro@collabora.comaptly: Add missing source architecture during publishingTask https://phabricator.apertis.org/T8672
We want to publish sources by default, which needs to be added to the
architectures list on publishing.Task https://phabricator.apertis.org/T8672
We want to publish sources by default, which needs to be added to the
architectures list on publishing.https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/27aptly: Don't generate Contents indexes on aptly publishing2022-06-09T06:38:07ZAriel D'Alessandroariel.dalessandro@collabora.comaptly: Don't generate Contents indexes on aptly publishingTask https://phabricator.apertis.org/T8672
Generating Contents indexes takes ages and and require a lot of data.
Basically, aptly scan through the contents of each .deb file.Task https://phabricator.apertis.org/T8672
Generating Contents indexes takes ages and and require a lot of data.
Basically, aptly scan through the contents of each .deb file.https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/26backend: Add cron to supervisord monitored processes2022-05-30T07:10:58ZAriel D'Alessandroariel.dalessandro@collabora.combackend: Add cron to supervisord monitored processesTask https://phabricator.apertis.org/T8672
Cron will be used to run periodic jobs on the backend. Let's add this to
the processed launched and monitored by supervisor.
Such cron functionality is required by aptly, which has been now
in...Task https://phabricator.apertis.org/T8672
Cron will be used to run periodic jobs on the backend. Let's add this to
the processed launched and monitored by supervisor.
Such cron functionality is required by aptly, which has been now
integrated to OBS. A few related scripts need to be run on the backend
to perform maintenance tasks.https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/24Dockerfile.backend: Install osc client tool2022-05-24T13:11:04ZAriel D'Alessandroariel.dalessandro@collabora.comDockerfile.backend: Install osc client toolThis tool is used by gitlab CI branching scripts.This tool is used by gitlab CI branching scripts.https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/20collabora/staging: Add reprepro repository migration to aptly2022-05-17T18:26:58ZAriel D'Alessandroariel.dalessandro@collabora.comcollabora/staging: Add reprepro repository migration to aptlyTask: https://phabricator.apertis.org/T8672
We need to move old reprepro repositories to aptly. This MR adds support for that.Task: https://phabricator.apertis.org/T8672
We need to move old reprepro repositories to aptly. This MR adds support for that.https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/10Add aptly support2022-05-13T07:02:08ZSjoerd SimonsAdd aptly supportThis commit integratates aptly backend. The following features are
supported:
* OBS repositories gets automatically created/removed on aptly.
* Each arch with the publish flag enabled in a repository, get published
on aptly.
* Package...This commit integratates aptly backend. The following features are
supported:
* OBS repositories gets automatically created/removed on aptly.
* Each arch with the publish flag enabled in a repository, get published
on aptly.
* Package binaries get added to the aptly repository right after they
get built. Old versions are automatically removed.
* Every time a package is published, a snapshot is taken and published.
Related documentation is added to `README.aptly.md`:
* aptly configuration files.
* snapshot and db-cleanup scripts.
Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/22Don’t show "Or sign in with" if no SSO is configured2022-05-12T08:25:57ZAndrej Shaduraandrew.shadura@collabora.co.ukDon’t show "Or sign in with" if no SSO is configuredSigned-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/23Copy secrets with correct ownership instead of symlinking them2022-05-12T08:00:38ZAndrej Shaduraandrew.shadura@collabora.co.ukCopy secrets with correct ownership instead of symlinking themSecrets are owned by root and are not world-readable by default, so
the frontend cannot access them when it’s not running as root.
Not all versions of docker-compose support setting access rights for
secrets, so instead of wrangling with...Secrets are owned by root and are not world-readable by default, so
the frontend cannot access them when it’s not running as root.
Not all versions of docker-compose support setting access rights for
secrets, so instead of wrangling with them, just copy secrets and
re-own them.
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/21Move the backend dependency to the right place in docker-compose.yml2022-05-12T07:59:25ZAndrej Shaduraandrew.shadura@collabora.co.ukMove the backend dependency to the right place in docker-compose.ymlSigned-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/18Increase period, timeout and threshold for the frontend liveness check2022-05-05T09:19:06ZAndrej Shaduraandrew.shadura@collabora.co.ukIncrease period, timeout and threshold for the frontend liveness checkExisting values lead to the frontend being killed when it becomes more
sluggish than usual.
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>Existing values lead to the frontend being killed when it becomes more
sluggish than usual.
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/19Allow new SSO logins in "deny" mode2022-05-04T10:22:39ZAndrej Shaduraandrew.shadura@collabora.co.ukAllow new SSO logins in "deny" modeThe can_register check is actually only suitable for preventing new
unverified registrations; in SSO mode, we normally trust the SSO
provider have performed the checks and only gives us users we’re
supposed to let in.
Ideally, this shou...The can_register check is actually only suitable for preventing new
unverified registrations; in SSO mode, we normally trust the SSO
provider have performed the checks and only gives us users we’re
supposed to let in.
Ideally, this should be a separate set of settings to allow e.g.
optionally requiring confirmation on SSO logins or to configure
different levels of trust per SSO provider.https://gitlab.collabora.com/obs/open-build-service/-/merge_requests/17Disable InfluxDB by default but allow configuring it through envvars2022-05-04T05:12:27ZAndrej Shaduraandrew.shadura@collabora.co.ukDisable InfluxDB by default but allow configuring it through envvarshttps://gitlab.collabora.com/obs/open-build-service/-/merge_requests/16helm: Add a configmap entry for aptly.conf2022-05-03T05:16:06ZAndrej Shaduraandrew.shadura@collabora.co.ukhelm: Add a configmap entry for aptly.confUsage (in `values.yaml`):
```yaml
global:
backend:
aptly:
rootDir: /srv/obs/aptly
ppaDistributorID: ""
```
This generates:
```json
{
"ppaDistributorID": "",
"rootDir": "/srv/obs/aptly"
}
```
at the location `/etc/ob...Usage (in `values.yaml`):
```yaml
global:
backend:
aptly:
rootDir: /srv/obs/aptly
ppaDistributorID: ""
```
This generates:
```json
{
"ppaDistributorID": "",
"rootDir": "/srv/obs/aptly"
}
```
at the location `/etc/obs/aptly.conf`.
cc @sjoerd, @adalessandrohttps://gitlab.collabora.com/obs/open-build-service/-/merge_requests/14SSO implementation2022-05-03T05:14:26ZAndrej Shaduraandrew.shadura@collabora.co.ukSSO implementationDepends on !11.Depends on !11.