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.

Sign up for GitHub

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

Jump to bottom

backport fix/feature to stable 2.2 #1171

Merged
merged 13 commits into from
Mar 24, 2023
Merged

backport fix/feature to stable 2.2 #1171

merged 13 commits into from
Mar 24, 2023

Conversation

ccx1024cc
Copy link
Contributor

@ccx1024cc ccx1024cc commented Mar 22, 2023 •
edited
Loading

  1. builder: support --parent-bootstrap for merge #1137
    b0f5edb rafs: do not fix blob id for old bootstrap
    a2ad16d smoke: add --parent-bootstrap for merge test
    7e65027 builder: support --parent-bootstrap for merge
  2. nydusify: fix pulling all platforms of source image #1146
    3fb31b9 nydusify: forcibly enabled --oci option when --oci-ref be enabled
    37e382c nydusify: fix unnecessary golang-lint error
    b60e92a nydusify: fix --oci option for convert subcommand
    da8083c nydusify: fix pulling all platforms of source image
  3. rafs: fix amplify can not be skipped. #1150
    62d213e rafs: fix amplify can not be skipped
  4. nydusify: fix oci media type handle #1163
    009443b nydusify: fix oci media type handle
  5. nydusify: cleanup work directory when conversion finish #1164
    d885d1a nydusify: cleanup work directory when conversion finish
  6. fix: stable/XXX branch not run ci #1172
    6973d9d fix: ci: actions are not triggered for stable/v2.2
  7. ci test: fix bug of compiling nydus-snapshotter #1161
    edc3b09 ci test: fix bug of compiling nydus-snapshotter
  8. deps: bump tempfile version to 3.4.0 to fix some security vulnerabilities #1123
    3031f75 deps: bump tempfile version to 3.4.0

@ccx1024cc ccx1024cc requested a review from a team as a code owner March 22, 2023 05:50
@ccx1024cc ccx1024cc requested review from bergwolf, luodw and adamqqqplay and removed request for a team March 22, 2023 05:50
@anolis-bot
Copy link
Collaborator

@ccx1024cc , a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/58586

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter❌ FAIL

Sorry, your test job failed. Please get the details in the link.

@anolis-bot
Copy link
Collaborator

@ccx1024cc , the code has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/58590

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

@adamqqqplay
Copy link
Member

Maybe we can edit this PR title to make it more readable?

@ccx1024cc ccx1024cc requested a review from a team as a code owner March 22, 2023 06:53
@ccx1024cc ccx1024cc requested review from liubin and imeoer and removed request for a team March 22, 2023 06:53
@anolis-bot
Copy link
Collaborator

@ccx1024cc , the code has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/58618

@anolis-bot
Copy link
Collaborator

@ccx1024cc , the code has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/58621

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

@anolis-bot
Copy link
Collaborator

@ccx1024cc , the code has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/59070

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

@anolis-bot
Copy link
Collaborator

@ccx1024cc , the title has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/59106

yqleng1987 and others added 2 commits March 23, 2023 18:04
@yqleng1987
ci test: fix bug of compiling nydus-snapshotter
3c4ceb6 
Since developers changed "make clear" to "make clean" in the Makefile
in nydus-snapshotter, it also needs to be updated in ci test.
Signed-off-by: Yiqun Leng <yqleng@linux.alibaba.com>
@adamqqqplay
deps: bump tempfile version to 3.4.0
3031f75 
Update tempfile related crates to fix GHSA-mc8h-8q98-g5hr

Signed-off-by: Qinqi Qu <quqinqi@linux.alibaba.com>
@anolis-bot
Copy link
Collaborator

@ccx1024cc , the code has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/59107

@anolis-bot
Copy link
Collaborator

@ccx1024cc , the title has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/59108

@ccx1024cc ccx1024cc changed the title [WIP ]Backport to stable 2.2 backport fix/feature to stable 2.2 Mar 23, 2023
@anolis-bot
Copy link
Collaborator

@ccx1024cc , the title has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/59109

@ccx1024cc ccx1024cc assigned ccx1024cc and unassigned ccx1024cc Mar 23, 2023
@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

imeoer
imeoer approved these changes Mar 23, 2023
View reviewed changes
Copy link
Collaborator

@imeoer imeoer left a comment

Choose a reason for hiding this comment

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

LGTM!

@imeoer
Copy link
Collaborator

imeoer commented Mar 23, 2023

cc @adamqqqplay Please resolve your comment, so that we can merge it, thanks!

adamqqqplay
adamqqqplay approved these changes Mar 24, 2023
View reviewed changes
Copy link
Member

@adamqqqplay adamqqqplay left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@jiangliu jiangliu merged commit d2bbd82 into dragonflyoss:stable/v2.2 Mar 24, 2023
@ccx1024cc ccx1024cc deleted the morgan/backport branch March 27, 2023 02:22
@hangvane hangvane mentioned this pull request Apr 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@imeoer imeoer imeoer approved these changes

@adamqqqplay adamqqqplay adamqqqplay approved these changes

@bergwolf bergwolf Awaiting requested review from bergwolf bergwolf is a code owner automatically assigned from dragonflyoss/nydus-reviewers

@luodw luodw Awaiting requested review from luodw luodw is a code owner automatically assigned from dragonflyoss/nydus-reviewers

@liubin liubin Awaiting requested review from liubin liubin is a code owner automatically assigned from dragonflyoss/nydus-maintainers

Assignees
No one assigned
Labels
anolis_test_pass backport/v2.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ccx1024cc @anolis-bot @adamqqqplay @imeoer @jiangliu @yqleng1987