chore: specify env tags for each branches #3071

STRRL · 2022-03-28T07:39:55Z

What problem does this PR solve?

close #3068

What's changed and how it works?

new file env-images.yaml for specifying the certain image tag required for current branch/context
new script ./hack/env-image-tag.sh for querying this file, usage: ./hack/env-image-tag.sh build-env, output: latest
related changes in makefile and GitHub action workflow

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

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: STRRL <str_ruiling@outlook.com>

ti-chi-bot · 2022-03-28T07:39:57Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

Hexilee
cwen0

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.

codecov · 2022-03-28T07:56:36Z

Codecov Report

Merging #3071 (3b72dc1) into master (ace51f9) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3071      +/-   ##
==========================================
- Coverage   38.07%   38.06%   -0.02%     
==========================================
  Files         105      105              
  Lines        9108     9108              
==========================================
- Hits         3468     3467       -1     
- Misses       5331     5332       +1     
  Partials      309      309

Impacted Files	Coverage Δ
pkg/workflow/controllers/deadline_reconciler.go	`64.44% <0.00%> (-2.23%)`	⬇️
pkg/selector/generic/mode.go	`28.20% <0.00%> (+2.56%)`	⬆️

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 ace51f9...3b72dc1. Read the comment docs.

hack/env-image-tag.sh

Signed-off-by: STRRL <str_ruiling@outlook.com>

hack/env-image-tag.sh

Signed-off-by: STRRL <str_ruiling@outlook.com>

Hexilee

The yq told me 'Error: unknown command ".build-env.tag" for "yq"' when I run ./hack/env-image-tag.sh build-env.

Hexilee

LGTM

cwen0

LGTM

cwen0 · 2022-03-31T02:55:26Z

/merge

ti-chi-bot · 2022-03-31T02:55:28Z

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

Commit hash: 5ebf4c6

Signed-off-by: STRRL <str_ruiling@outlook.com>

STRRL · 2022-03-31T08:05:10Z

/merge

ti-chi-bot · 2022-03-31T08:05:12Z

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

Commit hash: e5cc659

Signed-off-by: STRRL <str_ruiling@outlook.com>

STRRL · 2022-04-01T03:06:58Z

/merge

ti-chi-bot · 2022-04-01T03:07:01Z

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

Commit hash: 9624cb2

ti-srebot · 2022-04-01T03:36:56Z

cherry pick to release-2.1 failed

* chore: specify env tags within file Signed-off-by: STRRL <str_ruiling@outlook.com> * chore: update GHA workflow Signed-off-by: STRRL <str_ruiling@outlook.com> * fix: use PROJECT_DIR Signed-off-by: STRRL <str_ruiling@outlook.com> * refactor: remove useless cat Signed-off-by: STRRL <str_ruiling@outlook.com> * fix: address the comments from liftbot Signed-off-by: STRRL <str_ruiling@outlook.com> * fix: change e2e-helper repository Signed-off-by: STRRL <str_ruiling@outlook.com> * fix: change chaos-mesh-e2e repository Signed-off-by: STRRL <str_ruiling@outlook.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

STRRL · 2022-04-02T02:01:10Z

cherry pick to release-2.1 failed

Manually cherry-pick in #3096

* chore: specify env tags for each branches (#3071) * chore: specify env tags within file Signed-off-by: STRRL <str_ruiling@outlook.com> * chore: update GHA workflow Signed-off-by: STRRL <str_ruiling@outlook.com> * fix: use PROJECT_DIR Signed-off-by: STRRL <str_ruiling@outlook.com> * refactor: remove useless cat Signed-off-by: STRRL <str_ruiling@outlook.com> * fix: address the comments from liftbot Signed-off-by: STRRL <str_ruiling@outlook.com> * fix: change e2e-helper repository Signed-off-by: STRRL <str_ruiling@outlook.com> * fix: change chaos-mesh-e2e repository Signed-off-by: STRRL <str_ruiling@outlook.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io> * chore: update env image tags Signed-off-by: STRRL <str_ruiling@outlook.com> * chore: declare certain tag in makefile Signed-off-by: STRRL <str_ruiling@outlook.com> * chore: update makefile passthrough more env Signed-off-by: STRRL <str_ruiling@outlook.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

STRRL added 2 commits March 28, 2022 15:32

chore: specify env tags within file

2e9d6d2

Signed-off-by: STRRL <str_ruiling@outlook.com>

chore: update GHA workflow

45eb258

Signed-off-by: STRRL <str_ruiling@outlook.com>

STRRL added type/enhancement New feature or request rebuild-build-env-image rebuild build-env image in this PR rebuild-dev-env-image rebuild dev-env image in this PR needs-cherry-pick-release-2.1 labels Mar 28, 2022

ti-chi-bot requested a review from cwen0 March 28, 2022 07:40

ti-chi-bot added the size/L label Mar 28, 2022

STRRL requested review from YangKeao, Hexilee and iguoyr March 28, 2022 07:41

STRRL changed the title ~~chore: specify env tags within file~~ chore: specify env tags for each branches Mar 28, 2022

sonatype-lift bot reviewed Mar 28, 2022

View reviewed changes

hack/env-image-tag.sh Show resolved Hide resolved

sonatype-lift bot reviewed Mar 28, 2022

View reviewed changes

hack/env-image-tag.sh Outdated Show resolved Hide resolved

STRRL added 2 commits March 28, 2022 17:10

fix: use PROJECT_DIR

90e3b54

Signed-off-by: STRRL <str_ruiling@outlook.com>

refactor: remove useless cat

a239802

Signed-off-by: STRRL <str_ruiling@outlook.com>

sonatype-lift bot reviewed Mar 28, 2022

View reviewed changes

hack/env-image-tag.sh Outdated Show resolved Hide resolved

fix: address the comments from liftbot

5ebf4c6

Signed-off-by: STRRL <str_ruiling@outlook.com>

Hexilee reviewed Mar 30, 2022

View reviewed changes

Hexilee approved these changes Mar 30, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 label Mar 30, 2022

cwen0 approved these changes Mar 31, 2022

View reviewed changes

ti-chi-bot added status/LGT2 and removed status/LGT1 labels Mar 31, 2022

ti-chi-bot added the status/can-merge label Mar 31, 2022

Merge branch 'master' into specify-env-tags

d076d21

Merge branch 'master' into specify-env-tags

cb0b23b

ti-chi-bot removed the status/can-merge label Mar 31, 2022

STRRL force-pushed the specify-env-tags branch from 7d5dc63 to dec82a7 Compare March 31, 2022 05:42

fix: change e2e-helper repository

e5cc659

Signed-off-by: STRRL <str_ruiling@outlook.com>

STRRL force-pushed the specify-env-tags branch from dec82a7 to e5cc659 Compare March 31, 2022 05:51

ti-chi-bot added the status/can-merge label Mar 31, 2022

Merge branch 'master' into specify-env-tags

cca493f

STRRL mentioned this pull request Mar 31, 2022

cherrypick "refine logging in pkg time (#2964)" into release-2.1 #3045

Merged

9 tasks

ti-chi-bot and others added 2 commits March 31, 2022 16:10

Merge branch 'master' into specify-env-tags

bd677e7

fix: change chaos-mesh-e2e repository

9624cb2

Signed-off-by: STRRL <str_ruiling@outlook.com>

ti-chi-bot removed the status/can-merge label Mar 31, 2022

ti-chi-bot added the status/can-merge label Apr 1, 2022

Merge branch 'master' into specify-env-tags

3b72dc1

ti-chi-bot merged commit 96f979a into chaos-mesh:master Apr 1, 2022

STRRL mentioned this pull request Apr 2, 2022

chore: specify env tags for each branches (#3071) #3096

Merged

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: specify env tags for each branches #3071

chore: specify env tags for each branches #3071

STRRL commented Mar 28, 2022 •

edited

ti-chi-bot commented Mar 28, 2022 •

edited

codecov bot commented Mar 28, 2022 •

edited

Hexilee left a comment

Hexilee left a comment

cwen0 left a comment

cwen0 commented Mar 31, 2022

ti-chi-bot commented Mar 31, 2022

STRRL commented Mar 31, 2022

ti-chi-bot commented Mar 31, 2022

STRRL commented Apr 1, 2022

ti-chi-bot commented Apr 1, 2022

ti-srebot commented Apr 1, 2022

STRRL commented Apr 2, 2022

chore: specify env tags for each branches #3071

chore: specify env tags for each branches #3071

Conversation

STRRL commented Mar 28, 2022 • edited

What problem does this PR solve?

What's changed and how it works?

Related changes

Checklist

Release note

DCO

ti-chi-bot commented Mar 28, 2022 • edited

codecov bot commented Mar 28, 2022 • edited

Codecov Report

Hexilee left a comment

Choose a reason for hiding this comment

Hexilee left a comment

Choose a reason for hiding this comment

cwen0 left a comment

Choose a reason for hiding this comment

cwen0 commented Mar 31, 2022

ti-chi-bot commented Mar 31, 2022

STRRL commented Mar 31, 2022

ti-chi-bot commented Mar 31, 2022

STRRL commented Apr 1, 2022

ti-chi-bot commented Apr 1, 2022

ti-srebot commented Apr 1, 2022

STRRL commented Apr 2, 2022

STRRL commented Mar 28, 2022 •

edited

ti-chi-bot commented Mar 28, 2022 •

edited

codecov bot commented Mar 28, 2022 •

edited