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 for make check does not respect the env-images.yaml #3216

Merged
merged 6 commits into from
Jun 10, 2022

Conversation

DaivikDave
Copy link
Contributor

Signed-off-by: Daivik daivikdave229@gmail.com

What problem does this PR solve?

#3210

What's changed and how it works?

IMAGE_DEV_ENV_TAG and IMAGE_DEV_ENV_TAG were not accessible in build/build_images.py. It resulted in it taking the default value defined by export IMAGE_TAG ?= latest

Related changes

  • Need to update chaos-mesh/website
  • Need to update Dashboard UI
  • Need to cheery-pick to release branches
    • release-2.1
    • release-2.0

Checklist

CHANGELOG

  • I have updated the CHANGELOG.md
  • I have labeled this PR with "no-need-update-changelog"

Tests

  • Unit test
  • E2E test
  • No code
  • Manual test (add steps below)

Side effects

  • Breaking backward compatibility

Release note

Please add a release note.

You can safely ignore this section if you don't think this PR needs a release note.

DCO

If you find the DCO check fails, please run commands like below (Depends on the actual situations. For example, if the failed commit isn't the most recent) to fix it:

git commit --amend --signoff
git push --force

Signed-off-by: Daivik <daivikdave229@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 3, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • STRRL
  • YangKeao

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot requested review from STRRL and YangKeao May 3, 2022 13:07
@DaivikDave DaivikDave changed the title fix for make check does not respect the env-images.yaml Fix for make check does not respect the env-images.yaml May 3, 2022
@codecov
Copy link

codecov bot commented May 3, 2022

Codecov Report

Merging #3216 (3da8fb0) into master (58227af) will decrease coverage by 0.15%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3216      +/-   ##
==========================================
- Coverage   41.26%   41.11%   -0.16%     
==========================================
  Files         165      165              
  Lines       13819    13819              
==========================================
- Hits         5703     5681      -22     
- Misses       7691     7707      +16     
- Partials      425      431       +6     
Impacted Files Coverage Δ
pkg/workflow/controllers/abort_node_reconciler.go 15.11% <0.00%> (-3.49%) ⬇️
pkg/selector/generic/mode.go 25.64% <0.00%> (-2.57%) ⬇️
pkg/workflow/controllers/chaos_node_reconciler.go 55.87% <0.00%> (-2.30%) ⬇️
.../workflow/controllers/workflow_entry_reconciler.go 54.05% <0.00%> (-2.17%) ⬇️
...g/workflow/controllers/parallel_node_reconciler.go 60.12% <0.00%> (-1.90%) ⬇️
pkg/workflow/controllers/serial_node_reconciler.go 59.58% <0.00%> (-1.56%) ⬇️
pkg/workflow/controllers/task_reconciler.go 5.89% <0.00%> (-0.81%) ⬇️
.../workflow/controllers/abort_workflow_reconciler.go 57.14% <0.00%> (+8.16%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 58227af...3da8fb0. Read the comment docs.

Copy link
Member

@STRRL STRRL left a comment

Choose a reason for hiding this comment

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

Hi @DaivikDave! Thanks for your contribution!

Please update the CHANGELOG.md, rest LGTM!

after exporting enough of ENV, maybe BASIC_IMAGE_ENV could be removed in the future?

/cc @YangKeao

@cwen0 cwen0 added no-need-update-changelog Skip CI check "Must Update CHANGELOG" for this PR and removed no-need-update-changelog Skip CI check "Must Update CHANGELOG" for this PR labels May 6, 2022
Signed-off-by: Daivik <daivikdave229@gmail.com>
@DaivikDave
Copy link
Contributor Author

Thanks @STRRL , Updated the changelog!

@STRRL
Copy link
Member

STRRL commented May 6, 2022

Thanks @STRRL , Updated the changelog!

Hi @DaivikDave , you should update the section under Unreleased, not 2.2.0 :)

@STRRL
Copy link
Member

STRRL commented May 13, 2022

Hi @DaivikDave, do you need some help? :)

@DaivikDave
Copy link
Contributor Author

Hey @STRRL , I was unable to work on it due to some urgency. I'll get the changes pushed.

@DaivikDave
Copy link
Contributor Author

Hey @STRRL , Sorry for the delay, I made the changes.

Copy link
Member

@STRRL STRRL left a comment

Choose a reason for hiding this comment

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

LGTM!

@STRRL
Copy link
Member

STRRL commented Jun 6, 2022

/cc @YangKeao @iguoyr

@ti-chi-bot ti-chi-bot requested review from iguoyr and removed request for YangKeao June 6, 2022 08:58
Copy link
Member

@YangKeao YangKeao left a comment

Choose a reason for hiding this comment

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

LGTM

BTW: export doesn't work for the shell command in the Makefile. It's a known but will not be fixed issue (of the GNU make) 😢 .

@STRRL
Copy link
Member

STRRL commented Jun 10, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 1ed522c

@ti-chi-bot ti-chi-bot merged commit 61c4c22 into chaos-mesh:master Jun 10, 2022
@ti-srebot
Copy link
Contributor

cherry pick to release-2.1 failed

@ti-srebot
Copy link
Contributor

cherry pick to release-2.2 failed

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

Successfully merging this pull request may close these issues.

None yet

6 participants