Initial search and replace

.devcontainer/README.md

@@ -29,7 +29,7 @@ accessible to the same user inside the container.
 
     USER=yours
     # location of doozer checkout
-    DOOZER="$HOME/openshift/doozer"
+    DOOZER="$HOME/openshift-eng/doozer"
     CONTAINER="$DOOZER/.devcontainer"
 
     # make a copy of your kerberos credentials to mount in (if you mount in the original,

.devcontainer/settings.yaml

@@ -2,7 +2,7 @@
 working_dir: /workspaces/doozer-working-dir
 
 #Git URL or File Path to build data
-data_path: https://github.com/openshift/ocp-build-data.git
+data_path: https://github.com/openshift-eng/ocp-build-data.git
 
 #Sub-group directory or branch to pull build data
 # group: openshift-4.0

Dockerfile

@@ -35,8 +35,8 @@ LABEL io.k8s.display-name="Doozer Client" \
       io.k8s.description="Doozer is a client for managing and building groups of containers" \
       description="Doozer is a client for managing and building groups of containers" \
       io.openshift.tags="openshift" \
-      authoritative-source-url="https://github.com/openshift/doozer" \
-      url="https://github.com/openshift/doozer" \
+      authoritative-source-url="https://github.com/openshift-eng/doozer" \
+      url="https://github.com/openshift-eng/doozer" \
       name="doozer"
 
 # version information is set at build time

Installation.md

@@ -31,7 +31,7 @@ You will need to make sure that you can clone from GitHub without a password. If
 
 With the above completed you can just run the install script via:
 
-`bash <(curl https://raw.githubusercontent.com/openshift/doozer/master/install.sh)`
+`bash <(curl https://raw.githubusercontent.com/openshift-eng/doozer/master/install.sh)`
 
 You **must** run the script as the kerberos user you will be using.
 

README.md

@@ -1,7 +1,7 @@
 ## Doozer
 
 [![PyPI version](https://badge.fury.io/py/rh-doozer.svg)](https://badge.fury.io/py/rh-doozer)
-[![codecov](https://codecov.io/gh/openshift/doozer/branch/master/graph/badge.svg)](https://codecov.io/gh/openshift/doozer)
+[![codecov](https://codecov.io/gh/openshift-eng/doozer/branch/master/graph/badge.svg)](https://codecov.io/gh/openshift-eng/doozer)
 
 Doozer is a build management utility that currently has the capability to build RPMs and Container Images via OSBS/Brew
 
@@ -17,7 +17,7 @@ For new releases, Jenkins is already setup and deployment to PyPi is easy:
 
 - Bump the version in `./doozerlib/VERSION`
 - Push the change to `master`
-- Create a new GitHub release: https://github.com/openshift/doozer/releases/new
+- Create a new GitHub release: https://github.com/openshift-eng/doozer/releases/new
 
 That's it. Jenkins will do the rest automatically.
 
@@ -38,9 +38,9 @@ respectively, therefore those two files are released under [LGPL v3][].
 
 Checkout the [Usage doc](Usage.md)
 
-[Apache License 2.0]: https://github.com/openshift/doozer/blob/master/LICENSE
-[doozerlib/dotconfig.py]: https://github.com/openshift/doozer/blob/master/doozerlib/dotconfig.py
-[doozerlib/gitdata.py]: https://github.com/openshift/doozer/blob/master/doozerlib/gitdata.py
+[Apache License 2.0]: https://github.com/openshift-eng/doozer/blob/master/LICENSE
+[doozerlib/dotconfig.py]: https://github.com/openshift-eng/doozer/blob/master/doozerlib/dotconfig.py
+[doozerlib/gitdata.py]: https://github.com/openshift-eng/doozer/blob/master/doozerlib/gitdata.py
 [dotconfig]: https://github.com/adammhaile/dotconfig
 [gitdata]: https://github.com/adammhaile/gitdata
 [LGPL v3]: https://www.gnu.org/licenses/lgpl-3.0.en.html

Usage.md

@@ -17,7 +17,7 @@ For local doozer edit `~/.config/doozer/settings.yaml`
 working_dir: <path_to_dir>
 
 #Git URL or File Path to build data
-data_path: https://github.com/openshift/ocp-build-data.git
+data_path: https://github.com/openshift-eng/ocp-build-data.git
 
 #Sub-group directory or branch to pull build data
 group: openshift-4.0
@@ -47,7 +47,7 @@ Finally, `global_opts` is used to set some internal options and can only be conf
 
 # Image Configuration
 
-First, please note that you will need to have your image configured in a `doozer` compatible config repo, like [ocp-build-data](https://github.com/openshift/ocp-build-data/) as shown in the `doozer` config above. If your image is already built as part of the OCP release then it already exists in that repo and you are good to go.
+First, please note that you will need to have your image configured in a `doozer` compatible config repo, like [ocp-build-data](https://github.com/openshift-eng/ocp-build-data/) as shown in the `doozer` config above. If your image is already built as part of the OCP release then it already exists in that repo and you are good to go.
 
 If your image is not already part of the OCP build, we recommend forking `ocp-build-data` and adding it for the sake of testing. Just remember to update `settings.yaml` to point to your version.
 
@@ -56,11 +56,11 @@ If you have questions about the layout and format of `ocp-build-data` please rea
 
 # Running a Local Build
 
-For local builds you will need to make sure that you have `imagebuilder` installed and that you can access a properly-configured `docker`. Please follow the instructions on the [Doozer Setup doc](https://github.com/openshift/doozer/blob/master/README.md#local-image-builds).
+For local builds you will need to make sure that you have `imagebuilder` installed and that you can access a properly-configured `docker`. Please follow the instructions on the [Doozer Setup doc](https://github.com/openshift-eng/doozer/blob/master/README.md#local-image-builds).
 
 Once all the above is ready, you can build your image!
 
-*Please note that yes, you need to refer to your image to `doozer` with the **dist-git** name which is different than the common name for the image. In the near future ART will likely update `doozer` to take either name, but for the time being this is a historical usage quirk that's held over. So, for example, if you were to build `openshift/ose-ansible` you would need to specify `aos3-installation` which is defined by the yaml config [with the same name](https://github.com/openshift/ocp-build-data/blob/openshift-4.0/images/aos3-installation.yml) on `ocp-build-data`. All image config files in `ocp-build-data` have names that match their dist-git repo name, without exception.*
+*Please note that yes, you need to refer to your image to `doozer` with the **dist-git** name which is different than the common name for the image. In the near future ART will likely update `doozer` to take either name, but for the time being this is a historical usage quirk that's held over. So, for example, if you were to build `openshift/ose-ansible` you would need to specify `aos3-installation` which is defined by the yaml config [with the same name](https://github.com/openshift-eng/ocp-build-data/blob/openshift-4.0/images/aos3-installation.yml) on `ocp-build-data`. All image config files in `ocp-build-data` have names that match their dist-git repo name, without exception.*
 
 It requires 2 steps.
 

doozerlib/cli/images_streams.py

@@ -684,7 +684,7 @@ def reconcile_jira_issues(runtime, pr_links: Dict[str, str], dry_run: bool):
 notified of the proper mapping in the #aos-art Slack channel.
 
 Component name: {image_meta.get_component_name()} .
-Jira mapping: https://github.com/openshift/ocp-build-data/blob/main/product.yml
+Jira mapping: https://github.com/openshift-eng/ocp-build-data/blob/main/product.yml
 '''
         elif potential_project == 'Unknown':
             description += f'''
@@ -699,7 +699,7 @@ def reconcile_jira_issues(runtime, pr_links: Dict[str, str], dry_run: bool):
 against OCPBUGS/Unknown -- creating unnecessary processing work and delay.
 
 Component name: {image_meta.get_component_name()} .
-Jira mapping: https://github.com/openshift/ocp-build-data/blob/main/product.yml
+Jira mapping: https://github.com/openshift-eng/ocp-build-data/blob/main/product.yml
 '''
 
         fields = {

doozerlib/distgit.py

@@ -45,7 +45,7 @@
 OIT_END = '##OIT_END'
 
 CONTAINER_YAML_HEADER = """
-# This file is managed by doozer: https://github.com/openshift/doozer
+# This file is managed by doozer: https://github.com/openshift-eng/doozer
 # operated by the OpenShift Automated Release Tooling team (#aos-art on CoreOS Slack).
 
 # Any manual changes will be overwritten by doozer on the next build.
@@ -2047,7 +2047,7 @@ def _update_yum_update_commands(self, force_yum_updates: bool, df_fileobj: io.Te
             # and we must change the user to be root.
             # However for the final stage, injecting "USER 0" without changing the original base image user
             # may cause unexpected behavior if the container makes assumption about the user at runtime.
-            # Per https://github.com/openshift/doozer/pull/428#issuecomment-861795424,
+            # Per https://github.com/openshift-eng/doozer/pull/428#issuecomment-861795424,
             # introduce a new metadata `final_stage_user` for images so we can switch the user back later.
             if final_stage_user:
                 output.write(f"# {yum_update_line_flag}\nUSER 0\n")

doozerlib/repos.py

@@ -188,7 +188,7 @@ def conf_section(self, repotype, arch=ARCH_X86_64, enabled=None, section_name=No
 
 # Base header for all content_sets.yml output
 CONTENT_SETS = """
-# This file is managed by the doozer build tool: https://github.com/openshift/doozer,
+# This file is managed by the doozer build tool: https://github.com/openshift-eng/doozer,
 # by the OpenShift Automated Release Team (#aos-art on CoreOS Slack).
 # Any manual changes will be overwritten by doozer on the next build.
 #
@@ -354,7 +354,7 @@ def _validate_content_sets(self, arch, names):
 
     def validate_content_sets(self):
         # Determine repos that have no content sets defined at all; we will give these a pass if nothing tries to use them.
-        # This is one reason to accept it if no content_set is defined at all: https://github.com/openshift/ocp-build-data/pull/594
+        # This is one reason to accept it if no content_set is defined at all: https://github.com/openshift-eng/ocp-build-data/pull/594
         content_set_defined = {}
         for name, repo in self._repos.items():
             content_set_defined[name] = False

doozerlib/runtime.py

@@ -855,7 +855,7 @@ def get_product_config(self) -> Model:
         """
         if self._build_data_product_cache:
             return self._build_data_product_cache
-        url = 'https://raw.githubusercontent.com/openshift/ocp-build-data/main/product.yml'
+        url = 'https://raw.githubusercontent.com/openshift-eng/ocp-build-data/main/product.yml'
         req = urllib.request.Request(url)
         req.add_header('Accept', 'application/yaml')
         self._build_data_product_cache = Model(yaml.safe_load(exectools.urlopen_assert(req).read()))

install.sh

@@ -31,7 +31,7 @@ Before continuing, please be sure that you have
 kerberos authentication setup and have the internal
 Red Hat CA certificates installed. Follow the
 instructions here:
-https://github.com/openshift/doozer/blob/master/Installation.md
+https://github.com/openshift-eng/doozer/blob/master/Installation.md
 
 NOTE: Some commands will be run with sudo.
 Please enter sudo password when prompted.
@@ -145,7 +145,7 @@ printf "${GREEN}Starting install of doozer...${NC}\n"
 
 
 python -c "$(curl -fsSL https://raw.githubusercontent.com/junaruga/rpm-py-installer/master/install.py)"
-pip install ${USER_OPT} -r <(curl https://raw.githubusercontent.com/openshift/doozer/master/requirements.txt)
+pip install ${USER_OPT} -r <(curl https://raw.githubusercontent.com/openshift-eng/doozer/master/requirements.txt)
 
 show_cmd pip install ${USER_OPT} rh-doozer
 
@@ -160,4 +160,4 @@ show_cmd sudo docker pull brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/r
 
 printf "${GREEN} Complete! \o/ - You may now use doozer.\n"
 printf "However, you may need to logout and back in for docker to work.\n"
-printf "https://github.com/openshift/doozer/blob/master/Usage.md \n${NC}"
+printf "https://github.com/openshift-eng/doozer/blob/master/Usage.md \n${NC}"

rundoozer/setup.py

@@ -16,7 +16,7 @@ def _get_version():
     author_email="aos-team-art@redhat.com",
     version=_get_version(),
     description="CLI tool for managing and automating Red Hat software releases",
-    url="https://github.com/openshift/doozer",
+    url="https://github.com/openshift-eng/doozer",
     license="Red Hat Internal",
     packages=[],
     include_package_data=True,

setup.py

@@ -16,7 +16,7 @@
     setup_requires=['setuptools_scm'],
     description="CLI tool for managing and automating Red Hat software releases",
     long_description=open('README.md').read(),
-    url="https://github.com/openshift/doozer",
+    url="https://github.com/openshift-eng/doozer",
     license="Apache License, Version 2.0",
     packages=find_packages(exclude=["tests", "tests.*", "functional_tests", "functional_tests.*", "tests_functional", "tests_functional.*"]),
     include_package_data=True,

tests_functional/test_golang_rebase.py

@@ -49,8 +49,8 @@ def test_golang_builder(self):
 
         # Assert commit information
         self.assertEqual(dfp.labels['io.openshift.build.commit.id'], target_ocp_build_data_commitish)
-        self.assertEqual(dfp.labels['io.openshift.build.source-location'], "https://github.com/openshift/ocp-build-data")
-        self.assertEqual(dfp.labels['io.openshift.build.commit.url'], f"https://github.com/openshift/ocp-build-data/commit/{target_ocp_build_data_commitish}")
+        self.assertEqual(dfp.labels['io.openshift.build.source-location'], "https://github.com/openshift-eng/ocp-build-data")
+        self.assertEqual(dfp.labels['io.openshift.build.commit.url'], f"https://github.com/openshift-eng/ocp-build-data/commit/{target_ocp_build_data_commitish}")
 
         # Ensure that meta.content.set_build_variables == false  worked. Each of the following variables is
         # injected by doozer unless the set_build_variables is false. This is required for the golang builder