Skip to content

telemetry: add FIPS-specific channel#99733

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rail:fips-channel
Mar 28, 2023
Merged

telemetry: add FIPS-specific channel#99733
craig[bot] merged 1 commit intocockroachdb:masterfrom
rail:fips-channel

Conversation

@rail
Copy link
Copy Markdown
Member

@rail rail commented Mar 27, 2023

Previously, all official builds were reporting using the same telemetry channel.

This PR adds an new telemetry channel for the FIPS build target.

Fixes: CC-24110
Epic: DEVINF-478
Release note: None

Previously, all official builds were reporting using the same telemetry
channel.

This PR adds an new telemetry channel for the FIPS build target.

Fixes: CC-24110
Epic: DEVINF-478
Release note: None
@rail rail added C-enhancement Solution expected to add code/behavior + preserve backward-compat (pg compat issues are exception) A-release T-release Release Engineering & Automation Team backport-22.2.x backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only labels Mar 27, 2023
@rail rail requested a review from knz March 27, 2023 21:28
@rail rail requested a review from a team as a code owner March 27, 2023 21:28
@rail rail self-assigned this Mar 27, 2023
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you

@rail
Copy link
Copy Markdown
Member Author

rail commented Mar 28, 2023

bors r=knz

@craig craig bot merged commit 0745cd4 into cockroachdb:master Mar 28, 2023
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 28, 2023

Build succeeded:

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Mar 28, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 6100c55 to blathers/backport-release-22.2-99733: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@rail
Copy link
Copy Markdown
Member Author

rail commented Mar 28, 2023

@knz something tells me that I less care about backporting this to 22.2... What do you think?

@rail rail deleted the fips-channel branch March 28, 2023 16:41
@knz
Copy link
Copy Markdown
Contributor

knz commented Mar 28, 2023

@knz something tells me that I less care about backporting this to 22.2... What do you think?

what's your reasoning?

@rail
Copy link
Copy Markdown
Member Author

rail commented Mar 28, 2023

Because we treat 22.2 as an experimental branch for FIPS.

@knz
Copy link
Copy Markdown
Contributor

knz commented Mar 28, 2023

let's ask abhinav for input. he's the consumer of the telemetry data after all.

@rail
Copy link
Copy Markdown
Member Author

rail commented Mar 28, 2023

Sure. Let me see how bad is the conflict meanwhile.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-release backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only C-enhancement Solution expected to add code/behavior + preserve backward-compat (pg compat issues are exception) T-release Release Engineering & Automation Team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants