Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

Default branch is still Master #130

Closed
ypise opened this issue Aug 14, 2020 · 10 comments
Closed

Default branch is still Master #130

ypise opened this issue Aug 14, 2020 · 10 comments

Comments

@ypise
Copy link
Contributor

ypise commented Aug 14, 2020

To be in sync with the other component branching strategy, the default branch shouldn't be master (which is also a contentious term).
Kindly correct this to align this with the component repo strategy.

@mukul-seagate11
Copy link
Contributor

mukul-seagate11 commented Aug 14, 2020

@yash, I dont think so as currently default branch for component teams is 'dev' as,

image

image

image

Let me know If you have any such case ?

@yanqingfu
Copy link
Contributor

yanqingfu commented Aug 14, 2020

in the https://github.com/Seagate/cortx/blob/master/doc/CortxS3ServerQuickStart.md: git clone --recursive git@github.com:Seagate/cortx-s3server.git -b main works, should we use git clone --recursive git@github.com:Seagate/cortx-s3server.git -b dev? @mukul-seagate11

@ypise
Copy link
Contributor Author

ypise commented Aug 14, 2020

@mukul-seagate11
Still the default branch cannot be master.
We have decided to use main instead, haven't we?

@mukul-seagate11
Copy link
Contributor

@mukul-seagate11
Still the default branch cannot be master.
We have decided to use main instead, haven't we?

Yes correct and it should not be as master and as currently we are in early adaptors phase where default branch is 'dev' and not 'main' as shown but once we are completely opensource than default branch will be 'main' branch

Also, as per our process all repos 'master' branch has already been renamed to 'main' branch

@yanqingfu
Copy link
Contributor

yanqingfu commented Aug 18, 2020

@mukul-seagate11
Copy link
Contributor

@yanqingfu, Thanks for raising this issue, I had raised a Jira ticket, https://jts.seagate.com/browse/EOS-12248 to get proceed

@ypise
Copy link
Contributor Author

ypise commented Aug 18, 2020

@mukul-seagate11 @ypise https://github.com/Seagate/cortx is in 'master' branch

https://github.com/Seagate/cortx/tree/**master** ; https://github.com/Seagate/cortx/tree/**master**/doc

@yanqingfu
Exactly what this issue is about.
Thanks for echoing my concern.

@mukul-seagate11
Copy link
Contributor

Sure, thanks I had taken & forwarded this concern to get corrected

@johnbent
Copy link
Contributor

johnbent commented Oct 1, 2020

@mukul-seagate11 , can we close this one yet?

@mukul-seagate11
Copy link
Contributor

This issue has been addressed as default branch is 'main' branch for https://github.com/Seagate/cortx

subhalaxmisa pushed a commit to subhalaxmisa/cortx that referenced this issue Jun 13, 2022
…e in kickstart (Seagate#130)

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>
subhalaxmisa pushed a commit to subhalaxmisa/cortx that referenced this issue Jun 13, 2022
* EOS-14638 Excluded additional packages from RELEASE.INFO (Seagate#120)

* EOS-14638 Excluded unwanted Motr and SSPL packages from RELEASE.INFO file

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-14638 Fixed Codacy errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-14638 Fixed Codacy errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-14638 Fixed Codacy errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-14638 Fixed Codacy errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-14638 Fixed Codacy errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-14638 removed additional packages

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Add support for single ISO in custom build.  (Seagate#121)

* Add single ISO generation in custom-ci

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed stage ordering and syntax errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added support for single iso in RHEL 7.7 (#122)

* Add single ISO generation in custom-ci

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed stage ordering and syntax errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added single ISO support for RHEL 7.7 build

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-14266 prepare self-contained Linux distro (Seagate#107)

* kickstart and script to build custom-iso

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Moved kickstart and script to custom-iso

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed error in package section of kickstart file

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added SHA-512 encrypted password

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Improved custom-iso.sh and kickstart_centos-7.8.2003.cfg

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Include CORTX dependency packages inside ISO

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Tetsing cusotom package addition

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Install Packages from custom list

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Disable updates repo to fix installation issue

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* updated bootloader options to fix OS boot issue

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* updated custom-packages list to be added in ISO

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* updated script to copy packages, updated kickstart to install Mellanox packages

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added sysfsutils package. Removed default CentOS repositories

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed issues in kickstart_centos-7.8.2003.cfg

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added kickstart_centos-7.8.2003.cfg

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Updatedkickstart_centos-7.8.2003.cfg with inputs from infra team. included additional packages

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added bc packages required for Motr

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Imprved build-custom-iso.sh, Added missing packages in additional-packages.txt

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Improved build-custom-iso.sh, Added bc package in kickstart installation

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Add support for single ISO in custom build.  (Seagate#121)

* Add single ISO generation in custom-ci

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed stage ordering and syntax errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added support for single iso in RHEL 7.7 (#122)

* Add single ISO generation in custom-ci

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed stage ordering and syntax errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added single ISO support for RHEL 7.7 build

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fix for LRL-962

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Initial Jenkins folder structure (Seagate#123)

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added internal-ci folder structure.  (Seagate#124)

* Initial Jenkins folder structure

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added internal-ci folder structure

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fix for USB bootable stick (Seagate#128)

* Fix for USB bootable stick

* Added custom isolinux.cfg grub.conf

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed ks.cfg location, update EFI/BOOT/grub.cfg

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Ascsi-network-relay package, Removed inst.cmdline and quiet

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Removed systemd 219-73.el7_8.9 package

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added mlnx network nic configuration

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fix for proper network configuation after OS install (Seagate#129)

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added scsi-network-relay configuration, Added lshw and sshpass package in kickstart (Seagate#130)

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Use mv instead of cp for component packages.

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Remove component directory after copying rpm's

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Disabled cortx-extension copy.

c0e86f8c6b8cc40a21316b668d6d18a6cc716fc6

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Remove last_successful link

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added component Jenkinsfiles

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Do not move UDS packages

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Added "Repo creation" step

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fix for SSPL deployment failure.  (Seagate#131)

* Fix for SSPL failure. Remove libgudev1-219-73.el7_8.9.x86_64.rpm

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixing Codacy issues.

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-15138 Fixed Codacy errors.

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-15138 Fixed Codacy errors.

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-15138 Fixed Codacy errors.

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed Codacy issues for CSM

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-15138 Fixed Codacy errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-15138 Fixed Codacy errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* EOS-15138 Fixed Codacy errors

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Use custom-ci branch, Fixed descriptions.

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* Fixed motr current build locations

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* eos -> cortx, release -> stable , MERO -> MOTR

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* release -> stable

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* custom-ci -> stable

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>

* MERO -> MOTR

Signed-off-by: Shailesh Vaidya <shailesh.vaidya@seagate.com>
This issue was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants