Skip to content

Conversation

@cheesesashimi
Copy link
Member

@cheesesashimi cheesesashimi commented Jan 11, 2023

- What I did

Analyzed the MCO to understand where goutils was being introduced as a dependency. I discovered that it was introduced via the sprig template helper library. We only make use of two functions within that library (which do not depend on goutils). This enabled me to do the following:

  • Copy those funcs we use into our codebase.
  • Consolidate the use of those funcs into a single place. Further consolidation is possible, but outside the scope of this PR.
  • Wrote smoke test to validate that all templated manifests can be rendered and then decoded into the appropriate structs.
  • Removed sprig, goutils, and its dependent libraries from our vendor folder and go.mod / go.sum files.

Note to reviewer: I put the dependency removal in a commit by itself for easier review.

- How to verify it

Run the unit test suite

- Description for the changelog
Remove goutils from our dependency tree

@openshift-ci-robot
Copy link
Contributor

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5696, which is invalid:

  • expected the bug to target the "4.13.0" version, but it targets "4.12.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

- What I did

Analyzed the MCO to understand where goutils was being introduced as a dependency. I discovered that it was introduced via the sprig template helper library. We only make use of two functions within that library (which do not depend on goutils). This enabled me to do the following:

  • Copy those funcs we use into our codebase.
  • Consolidate the use of those funcs into a single place. Further consolidation is possible, but outside the scope of this PR.
  • Wrote smoke test to validate that all templated manifests can be rendered and then decoded into the appropriate structs.
  • Removed sprig, goutils, and its dependent libraries from our vendor folder and go.mod / go.sum files.

- How to verify it

Run the unit test suite

- Description for the changelog
Remove goutils from our dependency tree

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 11, 2023
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 11, 2023
@cheesesashimi cheesesashimi force-pushed the zzlotnik/remove-sprig-and-goutils-dependency branch from 31a7b87 to a450b74 Compare January 11, 2023 20:56
@openshift-ci-robot
Copy link
Contributor

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5696, which is invalid:

  • expected the bug to target the "4.13.0" version, but it targets "4.12.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

- What I did

Analyzed the MCO to understand where goutils was being introduced as a dependency. I discovered that it was introduced via the sprig template helper library. We only make use of two functions within that library (which do not depend on goutils). This enabled me to do the following:

  • Copy those funcs we use into our codebase.
  • Consolidate the use of those funcs into a single place. Further consolidation is possible, but outside the scope of this PR.
  • Wrote smoke test to validate that all templated manifests can be rendered and then decoded into the appropriate structs.
  • Removed sprig, goutils, and its dependent libraries from our vendor folder and go.mod / go.sum files.

Note to reviewer: I put the dependency removal in a commit by itself for easier review.

- How to verify it

Run the unit test suite

- Description for the changelog
Remove goutils from our dependency tree

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@cheesesashimi cheesesashimi force-pushed the zzlotnik/remove-sprig-and-goutils-dependency branch from a450b74 to d214971 Compare January 11, 2023 22:09
@cheesesashimi cheesesashimi force-pushed the zzlotnik/remove-sprig-and-goutils-dependency branch from d214971 to 31cbc9e Compare January 11, 2023 22:27
@yuqi-zhang
Copy link
Contributor

Did a first pass and everything makes sense, thanks for the quick fix!

As a side note, this did annoyingly create 5 bugs:
https://issues.redhat.com/browse/OCPBUGS-5696
https://issues.redhat.com/browse/OCPBUGS-5694
https://issues.redhat.com/browse/OCPBUGS-5692
https://issues.redhat.com/browse/OCPBUGS-5690
https://issues.redhat.com/browse/OCPBUGS-5688

in 4.12->4.8 order, but no 4.13, so it seems that e.g. an option would be:

  1. create a 4.13 bug (or clone the 4.12 one)
  2. backport each release manually and reference the relevant bug

or

  1. close the current bugs and have /cherry-pick create the necessary magic

up to you which works better

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 12, 2023

@cheesesashimi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws 31cbc9e link false /test okd-scos-e2e-aws
ci/prow/e2e-alibabacloud 31cbc9e link false /test e2e-alibabacloud

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@cheesesashimi
Copy link
Member Author

cheesesashimi commented Jan 12, 2023

Lets try the cherrypick magic as a first-pass. If we end up having a lot of difficulty, I'll do them manually.

Also, isn't 4.13 the most recent (i.e., master)? Or are we just missing a bug for 4.13?

@cheesesashimi
Copy link
Member Author

cheesesashimi commented Jan 12, 2023

/cherrypick release-4.11

EDIT: One must specify each cherrypick individually.

@openshift-cherrypick-robot

@cheesesashimi: once the present PR merges, I will cherry-pick it on top of release-4.11 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.11
/cherrypick release-4.10
/cherrypick release-4.9
/cherrypick release-4.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@cheesesashimi
Copy link
Member Author

/cherrypick release-4.10

@openshift-cherrypick-robot

@cheesesashimi: once the present PR merges, I will cherry-pick it on top of release-4.10 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@cheesesashimi
Copy link
Member Author

/cherrypick release-4.9

@openshift-cherrypick-robot

@cheesesashimi: once the present PR merges, I will cherry-pick it on top of release-4.9 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@cheesesashimi
Copy link
Member Author

/cherrypick release-4.8

@openshift-cherrypick-robot

@cheesesashimi: once the present PR merges, I will cherry-pick it on top of release-4.8 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@yuqi-zhang
Copy link
Contributor

/retest required

I wonder if this works

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 12, 2023

@yuqi-zhang: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test 4.12-upgrade-from-stable-4.11-images
  • /test cluster-bootimages
  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-upgrade
  • /test e2e-gcp-op
  • /test images
  • /test okd-scos-images
  • /test unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test 4.12-upgrade-from-stable-4.11-e2e-aws-ovn-upgrade
  • /test bootstrap-unit
  • /test e2e-alibabacloud-ovn
  • /test e2e-aws-disruptive
  • /test e2e-aws-ovn-workers-rhel8
  • /test e2e-aws-proxy
  • /test e2e-aws-serial
  • /test e2e-aws-single-node
  • /test e2e-aws-upgrade
  • /test e2e-aws-upgrade-single-node
  • /test e2e-aws-workers-rhel8
  • /test e2e-azure
  • /test e2e-azure-ovn-upgrade
  • /test e2e-azure-upgrade
  • /test e2e-gcp-op-single-node
  • /test e2e-gcp-single-node
  • /test e2e-gcp-upgrade
  • /test e2e-hypershift
  • /test e2e-metal-assisted
  • /test e2e-metal-ipi
  • /test e2e-metal-ipi-ovn-dualstack
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-openstack
  • /test e2e-openstack-parallel
  • /test e2e-ovirt
  • /test e2e-ovirt-upgrade
  • /test e2e-ovn-step-registry
  • /test e2e-vsphere
  • /test e2e-vsphere-upgrade
  • /test e2e-vsphere-upi
  • /test okd-e2e-aws
  • /test okd-e2e-gcp-op
  • /test okd-e2e-upgrade
  • /test okd-e2e-vsphere
  • /test okd-images
  • /test okd-scos-e2e-aws-ovn
  • /test okd-scos-e2e-gcp-op
  • /test okd-scos-e2e-gcp-ovn-upgrade
  • /test okd-scos-e2e-vsphere

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-machine-config-operator-master-e2e-alibabacloud-ovn
  • pull-ci-openshift-machine-config-operator-master-e2e-aws-ovn
  • pull-ci-openshift-machine-config-operator-master-e2e-aws-ovn-upgrade
  • pull-ci-openshift-machine-config-operator-master-e2e-gcp-op
  • pull-ci-openshift-machine-config-operator-master-e2e-hypershift
  • pull-ci-openshift-machine-config-operator-master-images
  • pull-ci-openshift-machine-config-operator-master-okd-images
  • pull-ci-openshift-machine-config-operator-master-okd-scos-e2e-aws-ovn
  • pull-ci-openshift-machine-config-operator-master-okd-scos-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-machine-config-operator-master-okd-scos-images
  • pull-ci-openshift-machine-config-operator-master-unit
  • pull-ci-openshift-machine-config-operator-master-verify
Details

In response to this:

/retest required

I wonder if this works

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@yuqi-zhang
Copy link
Contributor

oh whoops that should have been 1 command

but I do see the new required jobs, so I think we're good. I think this shouldn't require any pre-merge testing either right? Just removing some deps so CI coverage should be enough

@cheesesashimi
Copy link
Member Author

Yeah, I think this is all we need.

Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

/lgtm

I don't think this needs pre-merge testing, since it doesn't change any behaviour really, just removes some dependencies and adds testing. Will let the regular bug verification process do the trick instead.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 14, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cheesesashimi, yuqi-zhang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [cheesesashimi,yuqi-zhang]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@cheesesashimi
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5696, which is invalid:

  • expected the bug to target only the "4.13.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@cheesesashimi
Copy link
Member Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jan 16, 2023
@openshift-ci-robot
Copy link
Contributor

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5696, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.0) matches configured target version for branch (4.13.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @rioliu-rh

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 16, 2023
@openshift-ci openshift-ci bot requested a review from rioliu-rh January 16, 2023 20:36
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 8a25109 and 2 for PR HEAD 31cbc9e in total

@openshift-merge-robot openshift-merge-robot merged commit a7c4961 into openshift:master Jan 16, 2023
@openshift-ci-robot
Copy link
Contributor

@cheesesashimi: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-5696 has been moved to the MODIFIED state.

Details

In response to this:

- What I did

Analyzed the MCO to understand where goutils was being introduced as a dependency. I discovered that it was introduced via the sprig template helper library. We only make use of two functions within that library (which do not depend on goutils). This enabled me to do the following:

  • Copy those funcs we use into our codebase.
  • Consolidate the use of those funcs into a single place. Further consolidation is possible, but outside the scope of this PR.
  • Wrote smoke test to validate that all templated manifests can be rendered and then decoded into the appropriate structs.
  • Removed sprig, goutils, and its dependent libraries from our vendor folder and go.mod / go.sum files.

Note to reviewer: I put the dependency removal in a commit by itself for easier review.

- How to verify it

Run the unit test suite

- Description for the changelog
Remove goutils from our dependency tree

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@cheesesashimi: #3480 failed to apply on top of branch "release-4.9":

Applying: use common template rendering funcs
Using index info to reconstruct a base tree...
M	pkg/controller/common/helpers.go
M	pkg/controller/template/render.go
M	pkg/operator/render.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/render.go
CONFLICT (content): Merge conflict in pkg/operator/render.go
Auto-merging pkg/controller/template/render.go
Auto-merging pkg/controller/common/helpers.go
CONFLICT (content): Merge conflict in pkg/controller/common/helpers.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 use common template rendering funcs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick release-4.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@cheesesashimi: #3480 failed to apply on top of branch "release-4.8":

Applying: use common template rendering funcs
Using index info to reconstruct a base tree...
M	pkg/controller/common/helpers.go
M	pkg/controller/template/render.go
M	pkg/operator/render.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/render.go
CONFLICT (content): Merge conflict in pkg/operator/render.go
Auto-merging pkg/controller/template/render.go
Auto-merging pkg/controller/common/helpers.go
CONFLICT (content): Merge conflict in pkg/controller/common/helpers.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 use common template rendering funcs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick release-4.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@cheesesashimi: #3480 failed to apply on top of branch "release-4.11":

Applying: use common template rendering funcs
Using index info to reconstruct a base tree...
M	pkg/controller/common/helpers.go
M	pkg/controller/template/render.go
M	pkg/operator/render.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/render.go
Auto-merging pkg/controller/template/render.go
Auto-merging pkg/controller/common/helpers.go
CONFLICT (content): Merge conflict in pkg/controller/common/helpers.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 use common template rendering funcs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick release-4.11

EDIT: One must specify each cherrypick individually.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@cheesesashimi: #3480 failed to apply on top of branch "release-4.10":

Applying: use common template rendering funcs
Using index info to reconstruct a base tree...
M	pkg/controller/common/helpers.go
M	pkg/controller/template/render.go
M	pkg/operator/render.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/render.go
Auto-merging pkg/controller/template/render.go
Auto-merging pkg/controller/common/helpers.go
CONFLICT (content): Merge conflict in pkg/controller/common/helpers.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 use common template rendering funcs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick release-4.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@yuqi-zhang
Copy link
Contributor

/cherrypick release-4.12

@openshift-cherrypick-robot

@yuqi-zhang: #3480 failed to apply on top of branch "release-4.12":

Applying: use common template rendering funcs
Applying: adds smoke test for rendered assets
Applying: remove sprig / goutils / associated deps
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/k8s.io/code-generator/generate-groups.sh
M	vendor/k8s.io/code-generator/generate-internal-groups.sh
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/github.com/mitchellh/reflectwalk/reflectwalk.go
Removing vendor/github.com/mitchellh/reflectwalk/location_string.go
Removing vendor/github.com/mitchellh/reflectwalk/location.go
Removing vendor/github.com/mitchellh/reflectwalk/README.md
Removing vendor/github.com/mitchellh/reflectwalk/LICENSE
Removing vendor/github.com/mitchellh/reflectwalk/.travis.yml
Removing vendor/github.com/mitchellh/copystructure/copystructure.go
Removing vendor/github.com/mitchellh/copystructure/copier_time.go
Removing vendor/github.com/mitchellh/copystructure/README.md
Removing vendor/github.com/mitchellh/copystructure/LICENSE
Removing vendor/github.com/huandu/xstrings/translate.go
Removing vendor/github.com/huandu/xstrings/manipulate.go
Removing vendor/github.com/huandu/xstrings/format.go
Removing vendor/github.com/huandu/xstrings/doc.go
Removing vendor/github.com/huandu/xstrings/count.go
Removing vendor/github.com/huandu/xstrings/convert.go
Removing vendor/github.com/huandu/xstrings/common.go
Removing vendor/github.com/huandu/xstrings/README.md
Removing vendor/github.com/huandu/xstrings/LICENSE
Removing vendor/github.com/huandu/xstrings/CONTRIBUTING.md
Removing vendor/github.com/huandu/xstrings/.travis.yml
Removing vendor/github.com/huandu/xstrings/.gitignore
Removing vendor/github.com/Masterminds/sprig/url.go
Removing vendor/github.com/Masterminds/sprig/strings.go
Removing vendor/github.com/Masterminds/sprig/semver.go
Removing vendor/github.com/Masterminds/sprig/regex.go
Removing vendor/github.com/Masterminds/sprig/reflect.go
Removing vendor/github.com/Masterminds/sprig/numeric.go
Removing vendor/github.com/Masterminds/sprig/network.go
Removing vendor/github.com/Masterminds/sprig/list.go
Removing vendor/github.com/Masterminds/sprig/glide.yaml
Removing vendor/github.com/Masterminds/sprig/functions.go
Removing vendor/github.com/Masterminds/sprig/doc.go
Removing vendor/github.com/Masterminds/sprig/dict.go
Removing vendor/github.com/Masterminds/sprig/defaults.go
Removing vendor/github.com/Masterminds/sprig/date.go
Removing vendor/github.com/Masterminds/sprig/crypto.go
Removing vendor/github.com/Masterminds/sprig/appveyor.yml
Removing vendor/github.com/Masterminds/sprig/README.md
Removing vendor/github.com/Masterminds/sprig/Makefile
Removing vendor/github.com/Masterminds/sprig/LICENSE.txt
Removing vendor/github.com/Masterminds/sprig/CHANGELOG.md
Removing vendor/github.com/Masterminds/sprig/.travis.yml
Removing vendor/github.com/Masterminds/sprig/.gitignore
Removing vendor/github.com/Masterminds/goutils/wordutils.go
Removing vendor/github.com/Masterminds/goutils/stringutils.go
Removing vendor/github.com/Masterminds/goutils/randomstringutils.go
Removing vendor/github.com/Masterminds/goutils/cryptorandomstringutils.go
Removing vendor/github.com/Masterminds/goutils/appveyor.yml
Removing vendor/github.com/Masterminds/goutils/README.md
Removing vendor/github.com/Masterminds/goutils/LICENSE.txt
Removing vendor/github.com/Masterminds/goutils/CHANGELOG.md
Removing vendor/github.com/Masterminds/goutils/.travis.yml
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 remove sprig / goutils / associated deps
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick release-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants