Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Replace mojo links with The Source #459

Merged
merged 1 commit into from
Jul 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions doozerlib/distgit.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@

# Any manual changes will be overwritten by doozer on the next build.
#
# See https://mojo.redhat.com/docs/DOC-1159997 for more information on
# maintaining this file and the format and examples
# See https://source.redhat.com/groups/public/container-build-system/container_build_system_wiki/odcs_integration_with_osbs
# for more information on maintaining this file and the format and examples

---
"""
Expand Down Expand Up @@ -456,7 +456,7 @@ def _generate_osbs_image_config(self):
arches: # Optional list of image specific arches. If given, it must be a subset of group arches.
- x86_64
- s390x
container_yaml: ... # verbatim container.yaml content (see https://mojo.redhat.com/docs/DOC-1159997)
container_yaml: ... # verbatim container.yaml content (see https://source.redhat.com/groups/public/container-build-system/container_build_system_wiki/odcs_integration_with_osbs)
"""

# list of platform (architecture) names to build this image for
Expand All @@ -469,7 +469,7 @@ def _generate_osbs_image_config(self):

if self.config.content.source.pkg_managers is not Missing:
# If a package manager is specified, then configure cachito.
# https://mojo.redhat.com/docs/DOC-1177281#jive_content_id_Cachito_Integration
# https://source.redhat.com/groups/public/container-build-system/container_build_system_wiki/containers_from_source_multistage_builds_in_osbs#jive_content_id_Cachito_Integration
config_overrides.update({
'remote_source': {
'repo': convert_remote_git_to_https(self.actual_source_url),
Expand Down
4 changes: 2 additions & 2 deletions doozerlib/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ def pull_url(self):
# Query brew to find the most recently built release for this component version.
_, version, release = self.get_latest_build_info()

# we need to pull images from proxy since https://mojo.redhat.com/docs/DOC-1204856 if 'brew_image_namespace'
# is enabled.
# we need to pull images from proxy if 'brew_image_namespace' is enabled:
# https://source.redhat.com/groups/public/container-build-system/container_build_system_wiki/pulling_pre_quay_switch_over_osbs_built_container_images_using_the_osbs_registry_proxy
if self.runtime.group_config.urls.brew_image_namespace is not Missing:
name = self.runtime.group_config.urls.brew_image_namespace + '/' + self.config.name.replace('/', '-')
else:
Expand Down
4 changes: 2 additions & 2 deletions doozerlib/repos.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ def conf_section(self, repotype, arch=ARCH_X86_64, enabled=None, section_name=No
# 1. You start depending on a new product
# 2. You are preparing new product release and your content sets will change
#
# See https://mojo.redhat.com/docs/DOC-1023066 for more information on
# maintaining this file and the format and examples
# See https://source.redhat.com/groups/public/container-build-system/container_build_system_wiki/guide_to_layered_image_build_service_osbs
# for more information on maintaining this file and the format and examples.
#
# You should have one top level item for each architecture being built. Most
# likely this will be x86_64 and ppc64le initially.
Expand Down
2 changes: 1 addition & 1 deletion doozerlib/runtime.py
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ def resolve_brew_image_url(self, image_name_and_version):
elif self.group_config.urls.brew_image_namespace is not Missing:
# if there is a namespace, we need to flatten the image name.
# e.g. openshift/image:latest => openshift-image:latest
# ref: https://mojo.redhat.com/docs/DOC-1204856
# ref: https://source.redhat.com/groups/public/container-build-system/container_build_system_wiki/pulling_pre_quay_switch_over_osbs_built_container_images_using_the_osbs_registry_proxy
url = self.group_config.urls.brew_image_host
ns = self.group_config.urls.brew_image_namespace
name = image_name_and_version.replace('/', '-')
Expand Down