#9979 Replace master with main/rawhide
Merged 3 years ago by humaton. Opened 3 years ago by humaton.
humaton/releng master_to_rawhide  into  main

file modified
+21 -21
@@ -54,23 +54,23 @@ 

  

  The general workflow is as follows:

  

- * Checkout ``master`` branch of the local git clone of your releng repository

+ * Checkout ``main`` branch of the local git clone of your releng repository

    clone.

  

    ::

  

-     $ git checkout master

+     $ git checkout main

  

- * Pull upstream and merge into local master to make sure that your master

+ * Pull upstream and merge into local main to make sure that your main

    branch is in line with the latest changes from upstream. Then push it to your

    clone so that origin knows about the changes.

  

    ::

  

-     $ git pull --rebase upstream master

-     $ git push origin master

+     $ git pull --rebase upstream main

+     $ git push origin main

  

- * Create a topic branch from master.

+ * Create a topic branch from main.

  

    ::

  
@@ -88,20 +88,20 @@ 

      $ git commit -s -m "awesome patch to somefile.py"

  

  * This step is optional but recommended in order to avoid collisions when

-   submitting upstream. Here we will checkout master again and merge

-   ``upstream/master`` so that we can resolve any conflicts locally.

+   submitting upstream. Here we will checkout main again and merge

+   ``upstream/main`` so that we can resolve any conflicts locally.

  

    ::

  

-     $ git checkout master

-     $ git pull --rebase upstream master

-     $ git push origin master

+     $ git checkout main

+     $ git pull --rebase upstream main

+     $ git push origin main

  

- * Rebase on master before submitting a pull request

+ * Rebase on main before submitting a pull request

  

    ::

  

-     $ git rebase master

+     $ git rebase main

  

      ..... Resolve any conflicts if needed ......

  
@@ -128,7 +128,7 @@ 

  

  The following is an useful shell function to place in your ``~/.bashrc`` to

  help automate certain aspects of the developer workflow. It will allow you to

- merge in the upstream master or devel branch into your forked repository for

+ merge in the upstream main or devel branch into your forked repository for

  easily keeping in line with the upstream repository.

  

  The following is the bash function to be added to your ``~/.bashrc`` and make
@@ -138,7 +138,7 @@ 

  

      pullupstream () {

          if [[ -z "$1" ]]; then

-             printf "Error: must specify a branch name (e.g. - master, devel)\n"

+             printf "Error: must specify a branch name (e.g. - main, devel)\n"

          else

              pullup_startbranch=$(git describe --contains --all HEAD)

              git checkout $1
@@ -148,7 +148,7 @@ 

          fi

      }

  

- With the function in place you can easily pull and merge in the releng master

+ With the function in place you can easily pull and merge in the releng main

  branch even while using a topic branch as follows:

  

  ::
@@ -157,9 +157,9 @@ 

      On branch docs

      nothing to commit, working directory clean

  

-     $ pullupstream master

-     Switched to branch 'master'

-     Your branch is up-to-date with 'origin/master'.

+     $ pullupstream main

+     Switched to branch 'main'

+     Your branch is up-to-date with 'origin/main'.

      Already up-to-date.

      Everything up-to-date

      Switched to branch 'docs'
@@ -169,12 +169,12 @@ 

      nothing to commit, working directory clean

  

  Now that you're back on your topic branch you can easily rebase on your local

- master branch in order to resolve any merge conflicts that may come up for

+ main branch in order to resolve any merge conflicts that may come up for

  clean pull request submission.

  

  ::

  

-     $ git rebase master

+     $ git rebase main

      Current branch docs is up to date.

  

  

@@ -109,17 +109,17 @@ 

  

  ::

  

-     BRANCHES = {'el4': 'master', 'el5': 'master', 'el6': 'f12',

+     BRANCHES = {'el4': 'rawhide', 'el5': 'rawhide', 'el6': 'f12',

              'OLPC-2': 'f7',

-             'master': None,

-             'fc6': 'master',

-             'f7': 'master',

-             'f8': 'master',

-             'f9': 'master',

-             'f10': 'master',

-             'f11': 'master',

-             'f12': 'master',

-             'f13': 'master', 'f14': 'master'}

+             'rawhide': None,

+             'fc6': 'rawhide',

+             'f7': 'rawhide',

+             'f8': 'rawhide',

+             'f9': 'rawhide',

+             'f10': 'rawhide',

+             'f11': 'rawhide',

+             'f12': 'rawhide',

+             'f13': 'rawhide', 'f14': 'rawhide'}

  

  

  and update ``GITBRANCHES`` with the translation from pkgdb branch string to git
@@ -129,7 +129,7 @@ 

  

      GITBRANCHES = {'EL-4': 'el4', 'EL-5': 'el5', 'EL-6': 'el6', 'OLPC-2': 'olpc2',

                     'FC-6': 'fc6', 'F-7': 'f7', 'F-8': 'f8', 'F-9': 'f9', 'F-10': 'f10',

-                    'F-11': 'f11', 'F-12': 'f12', 'F-13': 'f13', 'F-14': 'f14', 'devel': 'master'}

+                    'F-11': 'f11', 'F-12': 'f12', 'F-13': 'f13', 'F-14': 'f14', 'devel': 'rawhide'}

  

  

  The genacls.pkgdb file also needs to be updated for active branches to
@@ -141,7 +141,7 @@ 

  

      ACTIVE = {'OLPC-2': 'olpc2/', 'EL-4': 'el4/', 'EL-5': 'el5/',

                'EL-6': 'el6/', 'F-11': 'f11/', 'F-12': 'f12/', 'F-13': 'f13/',

-               'F-14': 'f14/', 'devel': 'master'}

+               'F-14': 'f14/', 'devel': 'rawhide'}

  

  fedora-release

  --------------
@@ -169,7 +169,7 @@ 

  * Use pkgdb to request an F-15 branch of fedora-release

  * Use pkgdb2branch.py to actually make the branch

  * Update fedora-release clone

- * Adjust .spec file in master for new dist defines

+ * Adjust .spec file in rawhide for new dist defines

  * commit/build

  * Track build in koji to ensure proper tagging is used

  

@@ -58,7 +58,7 @@ 

  ^^^^^^^^^^^^^^^^^^

  Required permissions: provenpackage for GIT, cvsadmin for Package DB.

  

- We just have to remove the existing files from the ``master`` branch and

+ We just have to remove the existing files from the ``rawhide`` branch and

  replace them with a ``dead.package`` file whose contents describe why the

  package is dead. Also the package needs to be marked as retired in PackageDB.

  Fedpkg takes care of this:
@@ -110,7 +110,7 @@ 

  This should return nothing, as the ``wdm`` package is blocked.

  

  Also check that package DB shows that the package is retired and that the

- master branch contains only a dead.package file.

+ rawhide branch contains only a dead.package file.

  

  Consider Before Running

  =======================
@@ -128,4 +128,4 @@ 

  

  

  .. _FTBFS: https://fedoraproject.org/wiki/Fails_to_build_from_source

- .. _find_FTBFS.py: https://pagure.io/releng/blob/master/f/scripts/find_FTBFS.py

+ .. _find_FTBFS.py: https://pagure.io/releng/blob/main/f/scripts/find_FTBFS.py

@@ -27,7 +27,7 @@ 

  ---------------

  

  All the following listed repos needs updating, including adding a new branch

- for branched release and updating master branch with new release values.

+ for branched release and updating rawhide branch with new release values.

  

  1. https://pagure.io/pungi-fedora

  2. https://pagure.io/fedora-kickstarts
@@ -113,7 +113,7 @@ 

      +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json

      @@ -4,8 +4,8 @@

             "allow_retire": true,

-            "branchname": "master",

+            "branchname": "rawhide",

             "date_created": "2014-05-14 12:36:15",

      -      "date_updated": "2019-08-14 17:07:23",

      -      "dist_tag": ".fc32",
@@ -616,16 +616,16 @@ 

  Koji

  ----

  The koji build system needs to have some tag/target work done to handle builds

- from the new branch and to update where builds from master go. 

+ from the new branch and to update where builds from rawhide go.

  

  Run `make-koji-release-tags`_ script in `pagure releng`_ repo

  

  Fedora Release

  --------------

  The Fedora release package needs to be updated in both the new branch and in

- master.

+ rawhide.

  

- Changes to master branch in fedora-release package:

+ Changes to rawhide branch in fedora-release package:

  

  ::

  
@@ -711,7 +711,7 @@ 

  

  Similar to fedora-release, fedora-repos package also needs to be updated.

  

- Changes to master branch of fedora-repos package:

+ Changes to rawhide branch of fedora-repos package:

  

  ::

  
@@ -1061,7 +1061,7 @@ 

  ^^^^^^^^^^^^^^^^^^

  

  In releng repository update `script

- <https://pagure.io/releng/blob/master/f/scripts/sync-latest-container-base-image.sh#_38>`_.

+ <https://pagure.io/releng/blob/main/f/scripts/sync-latest-container-base-image.sh#_38>`_.

  

  And set current_rawhide variable.

  
@@ -1074,34 +1074,34 @@ 

  

  

  .. _pkgdb-proxy role:

-     https://pagure.io/fedora-infra/ansible/blob/master/f/roles/pkgdb-proxy

+     https://pagure.io/fedora-infra/ansible/blob/main/f/roles/pkgdb-proxy

  .. _packages3 role:

-     https://pagure.io/fedora-infra/ansible/blob/master/f/roles/packages3

+     https://pagure.io/fedora-infra/ansible/blob/main/f/roles/packages3

  .. _bodhi2 role:

-     https://pagure.io/fedora-infra/ansible/blob/master/f/roles/bodhi2

+     https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2

  .. _greenwave openshift role:

-     https://pagure.io/fedora-infra/ansible/blob/master/f/roles/openshift-apps/greenwave

+     https://pagure.io/fedora-infra/ansible/blob/main/f/roles/openshift-apps/greenwave

  .. _mbs role:

-     https://pagure.io/fedora-infra/ansible/blob/master/f/roles/mbs

+     https://pagure.io/fedora-infra/ansible/blob/main/f/roles/mbs

  .. _releng role:

-     https://pagure.io/fedora-infra/ansible/blob/master/f/roles/releng

+     https://pagure.io/fedora-infra/ansible/blob/main/f/roles/releng

  .. _robosignatory role:

-     https://pagure.io/fedora-infra/ansible/blob/master/f/roles/robosignatory

+     https://pagure.io/fedora-infra/ansible/blob/main/f/roles/robosignatory

  .. _make-koji-release-tags:

-     https://pagure.io/releng/blob/master/f/scripts/branching/make-koji-release-tags

+     https://pagure.io/releng/blob/main/f/scripts/branching/make-koji-release-tags

  .. _pagure releng:

      https://pagure.io/releng

  .. _create_emtpy_repos.sh:

-     https://pagure.io/releng/blob/master/f/scripts/branching/create_empty_repos.sh

+     https://pagure.io/releng/blob/main/f/scripts/branching/create_empty_repos.sh

  .. _File a Taskotron ticket:

      https://pagure.io/taskotron/new_issue?title=Fedora%20Branched%20notification&content=Fedora%20NN%20is%20now%20Branched

  .. _Fedora Layered Image Build System:

      https://docs.pagure.org/releng/layered_image_build_service.html

  .. _fedscm-admin commit:

-     https://pagure.io/fedscm-admin/c/7862d58b5982803dbe4c47e0262c6ce78bc903db?branch=master

+     https://pagure.io/fedscm-admin/c/7862d58b5982803dbe4c47e0262c6ce78bc903db?branch=main

  .. _block_retired.py:

-     https://pagure.io/releng/blob/master/f/scripts/block_retired.py

+     https://pagure.io/releng/blob/main/f/scripts/block_retired.py

  .. _block_retired.py commit:

-     https://pagure.io/releng/c/9eb97f491f7a767ab8b90498adfa3b34ee235247?branch=master

+     https://pagure.io/releng/c/9eb97f491f7a767ab8b90498adfa3b34ee235247?branch=main

  .. _fedora infra ticket:

      https://pagure.io/fedora-infrastructure/issue/9239#comment-671446

@@ -23,13 +23,13 @@ 

  Kickstart files are used to configure how the image is built and what is available in the image

  The solution consist of 3 Kickstarts.

  

- `fedora-container-common <https://pagure.io/fedora-kickstarts/blob/master/f/fedora-container-common.ks>`_

+ `fedora-container-common <https://pagure.io/fedora-kickstarts/blob/main/f/fedora-container-common.ks>`_

  

- `fedora-container-base <https://pagure.io/fedora-kickstarts/blob/master/f/fedora-container-base.ks>`_

+ `fedora-container-base <https://pagure.io/fedora-kickstarts/blob/main/f/fedora-container-base.ks>`_

  

- `fedora-container-base-minimal <https://pagure.io/fedora-kickstarts/blob/master/f/fedora-container-base-minimal.ks>`_

+ `fedora-container-base-minimal <https://pagure.io/fedora-kickstarts/blob/main/f/fedora-container-base-minimal.ks>`_

  

- Changes made on the master branch will results in the rawhide image, other branches (f30, f31) should

+ Changes made on the rawhide branch will results in the rawhide image, other branches (f30, f31) should

  be used to modify other releases.

  

  Compose Configuration (Pungi)
@@ -39,7 +39,7 @@ 

  

  For rawhide the configuration is in

  

- https://pagure.io/pungi-fedora/blob/master/f/fedora.conf

+ https://pagure.io/pungi-fedora/blob/main/f/fedora.conf

  

  While for other releases the configuration is in a dedicated file

  
@@ -52,7 +52,7 @@ 

  If you want to release the base image on registry.fp.o and quay.io you can use the following

  script.

  

- `sync-latest-container-base-image.sh <https://pagure.io/releng/blob/master/f/scripts/sync-latest-container-base-image.sh>`_

+ `sync-latest-container-base-image.sh <https://pagure.io/releng/blob/main/f/scripts/sync-latest-container-base-image.sh>`_

  

  You will need to run that script from on of the releng composer machines in the infrastructure

  in order to have the credentials.
@@ -80,4 +80,4 @@ 

  

  For the details on how to run the script please see

  

- `README <https://github.com/fedora-cloud/docker-brew-fedora/blob/master/README.md>`_.

+ `README <https://github.com/fedora-cloud/docker-brew-fedora/blob/main/README.md>`_.

@@ -41,4 +41,4 @@ 

  Consider Before Running

  =======================

  Make sure that the branch in question isn't one of our pre-created branches

- ``f??/master``, ``olpc?/master``, ``el?/master``

+ ``f??/rawhide``, ``olpc?/rawhide``, ``el?/rawhide``

file modified
+1 -1
@@ -11,7 +11,7 @@ 

  Sometimes, packagers request that we *unretire* a package branch that has

  previously been retired.

  

- This typically happens on the `master` branch, but could conceivably happen on

+ This typically happens on the `rawhide` branch, but could conceivably happen on

  any stable or arbitrary branch.

  

  Action

@@ -39,7 +39,7 @@ 

  The documentation is now live.

  

  .. note::

-     This will require someone with permissions to push to the master branch for

+     This will require someone with permissions to push to the rawhide branch for

      the releng repository. If you are curious whom all has this ability, please

      refer to the :doc:`Main Page <index>` and contact someone from the "Team

      Composition"

file modified
+8 -8
@@ -13,8 +13,8 @@ 

  

  

  log = logging.getLogger(__name__)

- RETIRING_BRANCHES = ["el6", "epel7", "epel8", "epel8-playground", "master", "f33"]

- PROD_ONLY_BRANCHES = ["el6", "epel7", "epel8", "epel8-playground", "master", "f33"]

+ RETIRING_BRANCHES = ["el6", "epel7", "epel8", "epel8-playground", "rawhide", "f33"]

+ PROD_ONLY_BRANCHES = ["el6", "epel7", "epel8", "epel8-playground", "rawhide", "f33"]

  

  PRODUCTION_PDC = "https://pdc.fedoraproject.org"

  STAGING_PDC = "https://pdc.stg.fedoraproject.org"
@@ -44,7 +44,7 @@ 

          if namespace == "container":

              # git branchname, koji tag, epel build tag

              self.mapping = (

-                 ("master", "f34-container", ""),

+                 ("rawhide", "f34-container", ""),

                  ("f33", "f33-container", ""),

                  ("f32", "f32-container", ""),

                  ("f31", "f31-container", ""),
@@ -58,7 +58,7 @@ 

          else:

              # git branchname, koji tag, epel build tag

              self.mapping = (

-                 ("master", "f34", ""),

+                 ("rawhide", "f34", ""),

                  ("f33", "f33", ""),

                  ("f32", "f32", ""),

                  ("f31", "f31", ""),
@@ -121,7 +121,7 @@ 

      return unblocked, blocked

  

  

- def unblocked_packages(branch="master", staging=False, namespace=DEFAULT_NS):

+ def unblocked_packages(branch="rawhide", staging=False, namespace=DEFAULT_NS):

      """

      Get a list of all unblocked pacakges in a branch.

      """
@@ -131,7 +131,7 @@ 

      return unblocked

  

  

- def get_retired_packages(branch="master", staging=False, namespace=DEFAULT_NS):

+ def get_retired_packages(branch="rawhide", staging=False, namespace=DEFAULT_NS):

      retiredpkgs = []

      # PDC uses singular names such as rpm and container

      if namespace.endswith('s'):
@@ -171,7 +171,7 @@ 

      return process, stdout, stderr

  

  

- def block_package(packages, branch="master", staging=False, namespace=DEFAULT_NS):

+ def block_package(packages, branch="rawhide", staging=False, namespace=DEFAULT_NS):

      if isinstance(packages, str):

          packages = [packages]

  
@@ -281,7 +281,7 @@ 

      parser.add_argument("packages", nargs="*", metavar="package",

                          help="Packages to block, default all retired packages")

      parser.add_argument(

-         "--branch", default="master",

+         "--branch", default="rawhide",

          help="Branch to retire specified packages on, default: %(default)s")

      parser.add_argument(

          "--staging", default=False, action="store_true",

@@ -19,12 +19,12 @@ 

  

      nms: This is the namespace, not necessary default is "rpms"

      pck: This is the name of the fedora package, user has to input this, has no default value

-     brc: This is the specific branch, not necessary default is "master"

+     brc: This is the specific branch, not necessary default is "rawhide"

  """

  parser = argparse.ArgumentParser()

  parser.add_argument("--nms", help="Name of the namespace that contains package", type=str, default="rpms")

  parser.add_argument("pck", help="Name of the fedora package", type=str)

- parser.add_argument("--brc", help="Name of the branched version of the package wanted", type=str, default="master")

+ parser.add_argument("--brc", help="Name of the branched version of the package wanted", type=str, default="rawhide")

  args = parser.parse_args()

  

  # this is the default url used for getting contributors the url is api/0/<namespace>/<package>

@@ -8,13 +8,13 @@ 

  Examples:

  

  -\------A---\

-   \----------\----- master

+   \----------\----- rawhide

  

- 'A' has been merged into 'master', so it can be trivially deletected

+ 'A' has been merged into 'rawhide', so it can be trivially deletected

  without checking any builds.

  

    /---/-------\-B"-B'-B

- -/---/---\-----\----master

+ -/---/---\-----\----rawhide

            \--C

  

  'B' has commits that are not found anywhere else (B, B', and B"), and
@@ -30,7 +30,7 @@ 

  cannot check if builds have been performed, so this script always

  refuses removal.

  

- Removal of the 'master' branch is always refused.

+ Removal of the 'rawhide' branch is always refused.

  

  3. Removal is refused in some additional corner cases:

  - the spec file cannot be parsed
@@ -220,8 +220,8 @@ 

          branch_name = branch.branch_name[l+1:]

          local = False

  

-     if branch_name == 'master':

-         print("Branch 'master' cannot be deleted.")

+     if branch_name == 'rawhide':

+         print("Branch 'rawhide' cannot be deleted.")

          return 1

  

      if bodhi_builds_exist(branch_name, opts.package, opts):

file modified
+4 -4
@@ -39,15 +39,15 @@ 

  published."""

  

  BRANCH_HIERARCHY = {

-     "master": "",

-     "f26": "master",

+     "rawhide": "",

+     "f26": "rawhide",

      "f25": "f26",

      "f24": "f25",

      "epel7": "",

      "el6": ""

  }

  

- def get_status(name, branch="master", namespace='rpms'):

+ def get_status(name, branch="rawhide", namespace='rpms'):

      # First, check to see if it is retired.

      # PDCClient pulls connection information from /etc/pdc.d/

      # develop=True means: don't authenticate.
@@ -136,7 +136,7 @@ 

  

  if __name__ == "__main__":

      parser = argparse.ArgumentParser(description="Helper to retire packages")

-     parser.add_argument("--branch", default=["master"], nargs="*",

+     parser.add_argument("--branch", default=["rawhide"], nargs="*",

                          choices=BRANCH_HIERARCHY.keys())

      parser.add_argument("--dry-run", default=False, action="store_true")

      parser.add_argument("--reasonfile", default=None)

@@ -74,7 +74,7 @@ 

      source_repo='https://kojipkgs.fedoraproject.org/compose/rawhide/'

                  'latest-Fedora-Rawhide/compose/Everything/source/tree/',

      tag='f34',

-     branch='master',

+     branch='rawhide',

      mailto='devel@lists.fedoraproject.org',

      bcc=[],

  )
@@ -125,7 +125,7 @@ 

  Release Engineering. Please report issues at its pagure instance:

  https://pagure.io/releng/

  The sources of this script can be found at:

- https://pagure.io/releng/blob/master/f/scripts/find_unblocked_orphans.py

+ https://pagure.io/releng/blob/main/f/scripts/find_unblocked_orphans.py

  """

  

  

@@ -109,7 +109,7 @@ 

          continue

  

      # Check out git

-     fedpkgcmd = ['fedpkg', '--user', 'releng', 'clone', '--branch', 'master', name]

+     fedpkgcmd = ['fedpkg', '--user', 'releng', 'clone', '--branch', 'rawhide', name]

      print('Checking out %s' % name)

      if runme(fedpkgcmd, 'fedpkg', name, enviro):

          continue

file modified
+10 -10
@@ -19,7 +19,7 @@ 

  # Set some variables

  # Some of these could arguably be passed in as args.

  

- #NOTE: The ordering of inputs matters. Please provide master/rawhide inputs first.

+ #NOTE: The ordering of inputs matters. Please provide main/rawhide inputs first.

  

  buildtag = 'f27' # tag to build from

  secondbuildtag = 'f26' # tag to build from
@@ -28,8 +28,8 @@ 

  comment = '- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild'

  workdir = os.path.expanduser('~/massbuild-gcc')

  enviro = os.environ

- targets = ['f27-gcc-abi-rebuild','f26-gcc-abi-rebuild'] #Set master/rawhide rebuild target first item in the list

- branches = ['master', 'f26'] #Set master(rawhide) branch first item in the list

+ targets = ['f27-gcc-abi-rebuild','f26-gcc-abi-rebuild'] #Set rawhide/rawhide rebuild target first item in the list

+ branches = ['rawhide', 'f26'] #Set rawhide(rawhide) branch first item in the list

  enviro['CVS_RSH'] = 'ssh' # use ssh for cvs

  

  pkg_skip_list = ['fedora-release', 'fedora-repos', 'fedora-modular-release', 'fedora-modular-repos', 'generic-release',
@@ -106,10 +106,10 @@ 

      #   continue

  

      # check the git hashes of the branches

-     gitcmd = ['git', 'rev-parse', 'origin/master']

-     print('getting git hash for master')

-     masterhash = runmeoutput(gitcmd, 'git', name, enviro, cwd=os.path.join(workdir, name))

-     if masterhash == 0:

+     gitcmd = ['git', 'rev-parse', 'origin/rawhide']

+     print('getting git hash for rawhide')

+     rawhidehash = runmeoutput(gitcmd, 'git', name, enviro, cwd=os.path.join(workdir, name))

+     if rawhidehash == 0:

          sys.stderr.write('%s has no git hash.\n' % name)

          break

   
@@ -145,7 +145,7 @@ 

              sys.stderr.write('%s failed spec check\n' % name)

              continue

  

-         if branch == buildtag or masterhash != secondhash:

+         if branch == buildtag or rawhidehash != secondhash:

              # rpmdev-bumpspec

              bumpspec = ['rpmdev-bumpspec', '-u', user, '-c', comment,

                          os.path.join(workdir, name, spec)]
@@ -160,8 +160,8 @@ 

                           cwd=os.path.join(workdir, name)):

                  continue

          else:

-             gitmergecmd = ['git', 'merge', 'master']

-             print("merging master into %s" % secondbuildtag)

+             gitmergecmd = ['git', 'merge', 'rawhide']

+             print("merging rawhide into %s" % secondbuildtag)

              if runme(gitmergecmd, 'git', name, enviro,

                           cwd=os.path.join(workdir, name)):

                  continue

file modified
+1 -1
@@ -112,7 +112,7 @@ 

          continue

  

      # Check out git

-     fedpkgcmd = ['fedpkg', '--user', 'releng', 'clone', '--branch', 'master', name]

+     fedpkgcmd = ['fedpkg', '--user', 'releng', 'clone', '--branch', 'rawhide', name]

      print('Checking out %s' % name)

      if runme(fedpkgcmd, 'fedpkg', name, enviro):

          continue

file modified
+1 -1
@@ -134,7 +134,7 @@ 

          print('<dd><a href="http://koji.fedoraproject.org/koji/packageinfo?packageID=%s">%s</a></dd>' % (pkg, pkg))

      print('</dl>')

  print('<p>The script that generated this page can be found at ')

- print('<a href="https://pagure.io/releng/blob/master/f/scripts">https://pagure.io/releng/blob/master/f/scripts</a>.')

+ print('<a href="https://pagure.io/releng/blob/main/f/scripts">https://pagure.io/releng/blob/main/f/scripts</a>.')

  print('There you can also report bugs and RFEs.</p>')

  print('</body>')

  print('</html>')

file modified
+2 -2
@@ -58,8 +58,8 @@ 

                          help="Uses the stg instance instead of the real pdc.")

  

      parser.add_argument(

-         'branch', default='master',

-         help="Branch of the package to add to critpath (default: 'master')")

+         'branch', default='rawhide',

+         help="Branch of the package to add to critpath (default: 'rawhide')")

      parser.add_argument(

          'txtlist',

          help="Filename containing list of packages to critpath")

rebased onto a289d88129eca0f08219a7e98587624dbef422da

3 years ago

1 new commit added

  • replace mater with rawhide in docs and strings
3 years ago

I would understand a change to "main", but the change to "rawhide" here doesn't seem correct :)

I don't think this one needs to be adjusted

s/rawhide/main/ here and in all the links below

The changes in scripts/find_unblocked_orphans.py are not both correct.

I've opened https://pagure.io/releng/pull-request/9983 instead.

I think all the links above needs to s/rawhide/main/ and I don't think the project listed on github underneath has migrated away from master

This is now a bit confusing :)

rebased onto 4275ae602657b821deb2d4946ef2e9f2ab717863

3 years ago

Thank you @pingou and @churchyard. All the changes should be in.

@humaton I would suggest rechecking twice before running the mass branching scripts tomorrow.

rebased onto 73fb16b

3 years ago

Pull-Request has been merged by humaton

3 years ago