Hi Vladamir!

 

Thanks for this, just a thought.

For those who are running from specific commit sha’s, we aren’t planning to deprecate this repo any time soon?

Give us a time to move to this new way of working?

 

Thanks,
Karl.

 


Karl Kloppenborg

Chief Technology Officer

m: +61 437 239 565
resetdata.com

reset.png

ResetData supports Mandatory Client Related Financial Disclosures – Scope 3 Emissions Reporting
For more information on the phasing of these requirements for business please visit;  
https://treasury.gov.au/sites/default/files/2024-01/c2024-466491-policy-state.pdf

This email transmission is intended only for the addressee / person responsible for delivery of the message to such person and may contain confidential or privileged information. Confidentiality and legal privilege are not waived or lost by reason of mistaken delivery to you, nor may you use, review, disclose, disseminate or copy any information contained in or attached to it. Whilst this email has been checked for viruses, the sender does not warrant that any attachments are free from viruses or other defects. You assume all liability for any loss, damage or other consequences which may arise from opening or using the attachments. If you received this e-mail in error please delete it and any attachments and kindly notify us by immediately sending an email to contact@resetdata.com.au

From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Friday, 21 March 2025 at 4:12 am
To: Jeremy Stanley <fungi@yuggoth.org>
Cc: openstack-discuss@lists.openstack.org <openstack-discuss@lists.openstack.org>
Subject: Re: [openstack-helm] Merge openstack-helm and openstack-helm-infra git repos

Hi team,

 

This has happened. We've merged our two repos. Test jobs are green now but there will be more changes (mostly cosmetic) regarding this.

 

Here is the project-config PR [1] to stop running gate jobs for the openstack-helm-infra. It will remain at the current state for a couple more weeks and after that we will retire it.

 

Thanks a lot to Jeremy. He suggested corrections for the merger procedure and helped to make this happen. 

 

 

 

 

On Mon, Mar 17, 2025 at 5:12 PM Vladimir Kozhukalov <kozhukalov@gmail.com> wrote:

Hi team,

 

At this point let's consider the openstack/openstack-helm-infra repo frozen. Core team, please do not merge anything to the openstack-helm-infra repo. There are only a few PRs on review [1] at the moment and we will later port them to openstack-helm repo. 

 

We,ve accepted a bunch of patches to reduce the number of merge conflicts during the merger. 

Now only one file .gitreview can not be merged automatically. So the procedure (I've tested it) is as follows:

 

```

mkdir osh_merge_tmp

cd osh_merge_tmp

cd openstack-helm

git remote add openstack-helm-infra https://opendev.org/openstack/openstack-helm-infra.git

git fetch openstack-helm-infra

git merge --allow-unrelated-histories openstack-helm-infra/master
## there must be a merge conflict here with the only file .gitreview
git checkout origin/master .gitreview

git merge --continue

```

After that the state of the master branch is ready to be pushed to gerrit (openstack/openstack-helm master).

 

Tomorrow I am going to reach out to Jeremy in IRC to sync up and to perform the procedure semi-real-time. As we agreed the merged state will be pushed w/o review.

 

After push is done test jobs WILL BE BROKEN due to wrong paths for test scripts and some Ansible roles/playbooks. We will fix this in the first PR AFTER merger. 

 

 

 

On Mon, Mar 10, 2025 at 5:00 PM Jeremy Stanley <fungi@yuggoth.org> wrote:

On 2025-03-10 16:44:30 -0500 (-0500), Vladimir Kozhukalov wrote:
[...]
> So, next step will be to manually construct the desirable state of
> the Openstack-helm repo (prepare the exact procedure to merge
> necessary commits from the openstack-helm-infra) and then I am
> going to contact Jeremy to arrange the exact time when this can be
> pushed to the Gerrit directly (w/o review).
[...]

Sounds good, best way to sync up with me is in IRC, I expect to be
around all next week and am usually awake and online by 13:00 UTC
this time of year.
--
Jeremy Stanley


 

--

Best regards,
Kozhukalov Vladimir


 

--

Best regards,
Kozhukalov Vladimir