Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update logic for determining network-operator base branch for values update PR #45

Merged

Conversation

maze88
Copy link
Collaborator

@maze88 maze88 commented Jan 14, 2025

pseudo logic:

if github.ref_type == 'branch' or github.ref_name.contains('beta'):   # branch commits and beta tags update values on network-operator's *master* branch
  BASE_BRANCH = 'master'
else:   # GA and `-rc.` tags update values on network-operator's respective *release* branches
  BASE_BRANCH = release_branch

additional changes:

  • e[val] is the default behavior of yq, no need to set it.
  • spacing for readability.
  • tee -a sets GITHUB_ENV variables while also printing them to log for clarity.

Copy link

Thanks for your PR,
To run vendors CIs, Maintainers can use one of:

  • /test-all: To run all tests for all vendors.
  • /test-e2e-all: To run all E2E tests for all vendors.
  • /test-e2e-nvidia-all: To run all E2E tests for NVIDIA vendor.

To skip the vendors CIs, Maintainers can use one of:

  • /skip-all: To skip all tests for all vendors.
  • /skip-e2e-all: To skip all E2E tests for all vendors.
  • /skip-e2e-nvidia-all: To skip all E2E tests for NVIDIA vendor.
    Best regards.

@maze88 maze88 requested a review from e0ne January 14, 2025 20:57
@coveralls
Copy link

coveralls commented Jan 14, 2025

Pull Request Test Coverage Report for Build 12784045004

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage decreased (-0.007%) to 47.397%

Files with Coverage Reduction New Missed Lines %
controllers/drain_controller_helper.go 1 63.59%
Totals Coverage Status
Change from base Build 12764686200: -0.007%
Covered Lines: 7266
Relevant Lines: 15330

💛 - Coveralls

cp -r ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/templates/ deployment/network-operator/charts/sriov-network-operator/
cp ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/README.md deployment/network-operator/charts/sriov-network-operator/
cp ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/values.yaml deployment/network-operator/charts/sriov-network-operator/
# we *don't* copy `Chart.yaml` with the files below, because network-operator's `Chart.yaml` refers to the SR-IOV chart name with a hardcoded version.
Copy link
Member

Choose a reason for hiding this comment

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

Not related to this PR, but we should delete the whole dir and then copy. This is needed in case a file has been deleted from the source.

Copy link
Member

Choose a reason for hiding this comment

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

We could also use rsync --delete to see all the files that are copied and deleted

Copy link
Member

@rollandf rollandf left a comment

Choose a reason for hiding this comment

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

LGTM

…lues update PR; and misc. corrections

Signed-off-by: Michael Zeevi <[email protected]>
@maze88 maze88 force-pushed the feature/adjust-dynamic-base-branch-logic branch from 4ece944 to dfed3b7 Compare January 15, 2025 08:09
Copy link
Collaborator

@e0ne e0ne left a comment

Choose a reason for hiding this comment

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

LGTM

@e0ne e0ne merged commit 4f2ace7 into Mellanox:master Jan 16, 2025
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants