Infrastructure/arc
3
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Fix small issues in toolbx investigation

Browse source 
* Add missing links
* Releng script is responsible for pushing images, not flatpak-plugin

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
This commit is contained in:
Michal Konecny 2023-09-01 12:17:11 +02:00
parent 649adaaa62
commit 55e7b6ff92
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
docs/registry_to_quay/toolbox.rst
View file

@ -16,8 +16,8 @@ gets enough karma it is moved by bodhi to
`registry.fedoraproject_org <https://registry.fedoraproject.org/>`_. `registry.fedoraproject_org <https://registry.fedoraproject.org/>`_.
This will change in F39 where the images will be built by This will change in F39 where the images will be built by
`koji-flatpak <https://pagure.io/koji-flatpak>`_ plugin. This plugin will submit the builds to `koji-flatpak <https://pagure.io/koji-flatpak>`_ plugin. Releng script will then submit the builds
both `registry.fedoraproject_org <https://registry.fedoraproject.org/>`_ and to both `registry.fedoraproject_org <https://registry.fedoraproject.org/>`_ and
`quay.io <https://quay.io>`_. `quay.io <https://quay.io>`_.
.. image:: ../_static/toolbox_workflow_registry.drawio.png .. image:: ../_static/toolbox_workflow_registry.drawio.png
@ -26,9 +26,9 @@ both `registry.fedoraproject_org <https://registry.fedoraproject.org/>`_ and
Changes for quay.io Changes for quay.io
------------------- -------------------
This section will describe changes that are needed to make quay.io work with current setup. This section will describe changes that are needed to make `quay.io <https://quay.io>`_
It will go through pipeline step by step and describe what needs to be changed in case of work with current setup. It will go through pipeline step by step and describe what
toolbx workflow. needs to be changed in case of toolbx workflow.
OSBS OSBS
^^^^ ^^^^
@ -39,11 +39,12 @@ file and pointing to candidate-registry. There is dockercfg for
`production <https://pagure.io/fedora-infra/ansible/blob/main/f/files/osbs/dockercfg-production-secret.j2>`_ and `staging <https://pagure.io/fedora-infra/ansible/blob/main/f/files/osbs/dockercfg-staging-secret.j2>`_. `production <https://pagure.io/fedora-infra/ansible/blob/main/f/files/osbs/dockercfg-production-secret.j2>`_ and `staging <https://pagure.io/fedora-infra/ansible/blob/main/f/files/osbs/dockercfg-staging-secret.j2>`_.
This dockercfg is used as a secret in OSBS and it's deployed in This dockercfg is used as a secret in OSBS and it's deployed in
`setup-worker-namespace <https://pagure.io/fedora-infra/ansible/blob/main/f/playbooks/groups/osbs/setup-worker-namespace.yml>`_ playbook. `setup-worker-namespace <https://pagure.io/fedora-infra/ansible/blob/main/f/playbooks/groups/osbs/setup-worker-namespace.yml>`_ playbook.
To make this work with quay.io we need to replace the dockercfg with new one pointing to quay.io. To make this work with `quay.io <https://quay.io>`_ we need to replace the dockercfg with new
one pointing to `quay.io <https://quay.io>`_.
.. note:: .. note::
OSBS could have trouble reaching to quay.io, this needs to be solved for this to work. OSBS could have trouble reaching to `quay.io <https://quay.io>`_, this needs to be solved for this to work.
Releng script Releng script
^^^^^^^^^^^^^ ^^^^^^^^^^^^^
@ -56,8 +57,9 @@ and it's already pushing images to `quay.io <https://quay.io>`_.
Bodhi Bodhi
^^^^^ ^^^^^
Bodhi is pushing the container builds from candidate-registry.fedoraproject.org to Bodhi is pushing the container builds from
registry.fedoraproject.org and this is configured in `candidate-registry.fedoraproject.org <https://candidate-registry.fedoraproject.org/>`_ to
`registry.fedoraproject_org <https://registry.fedoraproject.org/>`_ and this is configured in
`production.ini template <https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/base/templates/production.ini.j2>`_ `production.ini template <https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/base/templates/production.ini.j2>`_
in ansible. in ansible.