You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by "Ekaterina Dimitrova (Jira)" <ji...@apache.org> on 2023/08/25 17:46:00 UTC
[jira] [Comment Edited] (CASSANDRA-18797) CircleCI: Fix BASE_BRANCH in generate.sh for cassandra-5.0
[ https://issues.apache.org/jira/browse/CASSANDRA-18797?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17759120#comment-17759120 ]
Ekaterina Dimitrova edited comment on CASSANDRA-18797 at 8/25/23 5:45 PM:
--------------------------------------------------------------------------
I did not find any easy way to automate the detection of the base branch. Even if we rely on the C* version from build.xml, we still need to update for trunk when branching. If anyone has any quick ideas - I am open to hearing it. We can add a base_branch in build.xml, but it will still be one more thing to update on branching. The only plus will be that it can reside next to the cassandra_version for example so it will be harder to forget about it. We can probably make it one thing for all CIs when CI v2 is ready, and we have same scripts distributed in the different CI systems.
Patch: [https://github.com/ekaterinadimitrova2/cassandra/commit/4f212f5a791416d2bdd47c87eaa392af7bcfe3a2]
Tested locally like this:
{code:java}
./generate.sh -p
Generating new config.yml file for paid tier from config_template.yml
patching file ./config_template.yml
Detecting new or modified tests with git diff --diff-filter=AMR cassandra-5.0...HEAD:
{code}
[~adelapena] , [~mck] , do you mind taking a look when you have time? Thanks in advance
was (Author: e.dimitrova):
I did not find any easy way to automate the detection of the base branch. Even if we rely on the C* version from build.xml, we still need to update for trunk when branching. If anyone has any quick ideas - I am open to hearing it.
Patch: https://github.com/ekaterinadimitrova2/cassandra/commit/4f212f5a791416d2bdd47c87eaa392af7bcfe3a2
Tested locally like this:
{code:java}
./generate.sh -p
Generating new config.yml file for paid tier from config_template.yml
patching file ./config_template.yml
Detecting new or modified tests with git diff --diff-filter=AMR cassandra-5.0...HEAD:
{code}
[~adelapena] , [~mck] , do you mind taking a look when you have time? Thanks in advance
> CircleCI: Fix BASE_BRANCH in generate.sh for cassandra-5.0
> ----------------------------------------------------------
>
> Key: CASSANDRA-18797
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18797
> Project: Cassandra
> Issue Type: Bug
> Components: CI
> Reporter: Ekaterina Dimitrova
> Assignee: Ekaterina Dimitrova
> Priority: Normal
> Fix For: 5.0.x
>
>
> We have hardcoded BASE_BRANCH in the CircleCI script generate.sh. That one is used for the diff comparison when we detect new/changed tests.
> After adding cassandra-5.0, BASE_BRANCH needs to be updated from trunk to cassandra-5.0 in the newly created branch.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org