From 102a9dda71741e6c0bff4b7864a2f95ecb5919ee Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sun, 9 Oct 2022 11:48:06 +0800 Subject: [PATCH 1/2] workflow: Revert "workflow: trigger test-kata-deploy with pull_request" This reverts commit 7676cde0c5c4e5a99bca626770e534cab48c1db7. It turns out that when triggerred from a PR, the docker login command is failing with ``` Error: Cannot perform an interactive login from a non TTY device ``` Signed-off-by: Peng Tao --- .github/workflows/kata-deploy-test.yaml | 27 ++++++------------------- docs/Release-Process.md | 2 +- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.github/workflows/kata-deploy-test.yaml b/.github/workflows/kata-deploy-test.yaml index e7ff49e1a5..c2270ebd05 100644 --- a/.github/workflows/kata-deploy-test.yaml +++ b/.github/workflows/kata-deploy-test.yaml @@ -1,19 +1,11 @@ on: - pull_request: # this will trigger the workflow on PRs that changes release version - types: - - opened - - edited - - reopened - - synchronize - paths: - - VERSION - workflow_dispatch: # this allows to trigger the workflow manually on non-main branches + workflow_dispatch: # this is used to trigger the workflow on non-main branches inputs: pr: description: 'PR number from the selected branch to test' type: string required: true - issue_comment: # this allows to trigger the workflow from main by commenting "/test_kata_deploy" + issue_comment: types: [created, edited] name: test-kata-deploy @@ -27,14 +19,13 @@ jobs: && github.event.action == 'created' && startsWith(github.event.comment.body, '/test_kata_deploy') || github.event_name == 'workflow_dispatch' - || github.event_name == 'pull_request' steps: - name: Check membership on comment or dispatch uses: kata-containers/is-organization-member@1.0.1 id: is_organization_member with: organization: kata-containers - username: ${{ github.event.comment.user.login || github.event.sender.login }} # first one applies only on issue_comment + username: ${{ github.event.comment.user.login || github.event.sender.login }} token: ${{ secrets.GITHUB_TOKEN }} - name: Fail if not member run: | @@ -70,10 +61,8 @@ jobs: run: | if [ ${{ github.event_name }} == 'issue_comment' ]; then ref=$(cat $GITHUB_EVENT_PATH | jq -r '.issue.pull_request.url' | sed 's#^.*\/pulls#refs\/pull#' | sed 's#$#\/merge#') - elif [ ${{ github.event_name }} == 'workflow_dispatch' ]; then + else # workflow_dispatch ref="refs/pull/${{ github.event.inputs.pr }}/merge" - elif [ ${{ github.event_name }} == 'pull_request' ]; then - ref="refs/pull/${{ github.event.number }}/merge" fi echo "reference for PR: " ${ref} "event:" ${{ github.event_name }} echo "##[set-output name=pr-ref;]${ref}" @@ -112,10 +101,8 @@ jobs: run: | if [ ${{ github.event_name }} == 'issue_comment' ]; then ref=$(cat $GITHUB_EVENT_PATH | jq -r '.issue.pull_request.url' | sed 's#^.*\/pulls#refs\/pull#' | sed 's#$#\/merge#') - elif [ ${{ github.event_name }} == 'workflow_dispatch' ]; then + else # workflow_dispatch ref="refs/pull/${{ github.event.inputs.pr }}/merge" - elif [ ${{ github.event_name }} == 'pull_request' ]; then - ref="refs/pull/${{ github.event.number }}/merge" fi echo "reference for PR: " ${ref} "event:" ${{ github.event_name }} echo "##[set-output name=pr-ref;]${ref}" @@ -145,10 +132,8 @@ jobs: run: | if [ ${{ github.event_name }} == 'issue_comment' ]; then ref=$(cat $GITHUB_EVENT_PATH | jq -r '.issue.pull_request.url' | sed 's#^.*\/pulls#refs\/pull#' | sed 's#$#\/merge#') - elif [ ${{ github.event_name }} == 'workflow_dispatch' ]; then + else # workflow_dispatch ref="refs/pull/${{ github.event.inputs.pr }}/merge" - elif [ ${{ github.event_name }} == 'pull_request' ]; then - ref="refs/pull/${{ github.event.number }}/merge" fi echo "reference for PR: " ${ref} "event:" ${{ github.event_name }} echo "##[set-output name=pr-ref;]${ref}" diff --git a/docs/Release-Process.md b/docs/Release-Process.md index c9991d4b09..7dcfb84a30 100644 --- a/docs/Release-Process.md +++ b/docs/Release-Process.md @@ -48,7 +48,7 @@ ### Merge all bump version Pull requests - The above step will create a GitHub pull request in the Kata projects. Trigger the CI using `/test` command on each bump Pull request. - - `test-kata-deploy` workflow should be triggered automatically, validate it passes under the `Actions` tab on the repository GitHub page (you're also able to run it manually from there). + - Trigger the `test-kata-deploy` workflow which is under the `Actions` tab on the repository GitHub page (make sure to select the correct branch and validate it passes). - Check any failures and fix if needed. - Work with the Kata approvers to verify that the CI works and the pull requests are merged. From ee74231b1cb2fdfa249d2b7e5278ffab1ddce696 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Sat, 8 Oct 2022 12:42:40 +0000 Subject: [PATCH 2/2] release: Kata Containers 3.1.0-alpha0 - libs/kata-types: adjust default_vcpus correctly - runtime-rs: delete duplicated PASSTHROUGH_FS_DIR const - Enable ACRN hypervisor support for Kata 2.x release - agent: reduce reference count for failed mount - agent: don't exit early if signal fails due to ESRCH - kata-sys-util: delete duplicated get_bundle_path - packaging: Mount $HOME/.docker in the 1st layer container - Upgrade to Cloud Hypervisor v27.0 - microvm: Remove kernel_irqchip=on option - kata-sys-util: fix typo `unknow` - dragonball: update ut for kernel config - versions: Update gperf url to avoid libseccomp random failures - versions: Update oci version - dragonball: fix no "as_str" error on Arm - tools: release: fix bogus version check - runtime-rs: update Cargo.lock - refactor(runtime-rs): Use RwLock in runtime-agent - runtime-rs: fix shim close_io call to support kubectl cp - runtime-rs: add comments for runtime-rs shared directory - workflow: trigger test-kata-deploy with pull_request and fix workflow_dispatch - Dragonball: update linux_loader to 0.6.0 - modify virtio_net_dev_mgr.rs wrong code comments - docs: Update urls in runk documentation - runtime-rs: support watchable mount - runtime-rs: debug console support in runtime - kata-deploy: ship the rustified runtime binary - runtime-rs: define VFIO unbind path as a const - runtime-rs: set agent timeout to 0 for stream RPCs - Added SNP-Support for Kata-Containers - packaging: fix typo in configure-hypervisor.sh - runtime/runtime-rs: update dependency - release: Revert kata-deploy changes after 3.0.0-rc0 release - runtime-rs: add test for StaticResource - runtime-rs: remove hardcoded string - docs: add README for runtime-rs hypervisor crate - runtime-rs: use Path.is_file to check regular files - osbuilder: Export directory variables for libseccomp - runtime-rs: add unit tests for network resource - runtime-rs/resource: use macro to reduce duplicated code - runtime-rs: fix incorrect comments - kernel: Add crypto kernel config for s390 - Non-root hypervisor uid reuse bug - Build-in Sandbox: update dragonball-sandbox dependencies - docs: Update url in virtualization document - dragonball: Fix problem that stdio console cannot connect to stdout - runtime-rs: call TomlConfig's validate function after load - feat(Shimmgmt): Shim management server and client 53f209af4 libs/kata-types: adjust default_vcpus correctly ef5a2dc3b agent: don't exit early if signal fails due to ESRCH 435c8f181 acrn: Enable ACRN hypervisor support for Kata 2.x release c31cf7269 agent: reduce reference count for failed mount 4da743f90 packaging: Mount $HOME/.docker in the 1st layer container 067e2b1e3 runtime: clh: Use the new API to boot with TDX firmware (td-shim) 5d63fcf34 runtime: clh: Re-generate the client code fe6107042 versions: Upgrade to Cloud Hypervisor v27.0 17de94e11 microvm: Remove kernel_irqchip=on option 3aeaa6459 runtime-rs: delete duplicated PASSTHROUGH_FS_DIR const 43ae97233 kata-sys-util: delete duplicated get_bundle_path ac0483122 kata-sys-util: fix typo `unknow` a24127659 versions: Update gperf url to avoid libseccomp random failures a617a6348 versions: Update oci version 6d585d591 dragonball: fix no "as_str" error on Arm 421729f99 tools: release: fix bogus version check 457b0beaf runtime-rs: update Cargo.lock f89ada2de dragonball: update ut for kernel config 0e899669e runtime-rs: fix shim close_io call to support kubectl cp 96cf21fad runtime-rs: add comments for runtime-rs shared directory 9bd941098 docs: Update urls in runk documentation 90ecc015e Dragonball: update linux_loader to 0.6.0 4a763925e runtime-rs: support watchable mount abc26b00b dragonball: modify wrong code comments modify virtio_net_dev_mgr.rs wrong code comments 20bcaf0e3 runtime-rs: set agent timeout to 0 for stream RPCs 274de024c docs: add README for runtime-rs hypervisor crate a4a23457c osbuilder: Export directory variables for libseccomp d663f110d kata-deploy: get the config path from cri options c6b3dcb67 kata-deploy: support kata-deploy for runtime-rs 46965739a runtime-rs: remove hardcoded string a394761a5 kata-deploy: add installation for runtime-rs 50299a329 refactor(runtime-rs): Use RwLock in runtime agent 9628c7df0 runtime: update runc dependency 7fbc88387 runtime-rs: drop dependency on rustc-serialize bf2be0cf7 release: Revert kata-deploy changes after 3.0.0-rc0 release e23bfd615 runtime-rs: make function name more understandable 426a43678 runtime-rs: add unit test and eliminate raw string 87959cb72 runtime-rs: debug console support in runtime d55cf9ab7 docs: Update url in virtualization document 0399da677 runtime-rs: update dependencies f6f19917a dragonball: update dragonball-sandbox dependencies 2caee1f38 runtime-rs: define VFIO unbind path as a const 3f65ff2d0 runtime-rs: fix incorrect comments 9670a3caa runtime-rs: use Path.is_file to check regular files d9e6eb11a docs: Guide to use SNP-VMs with Kata-Containers ded60173d runtime: Enable choice between AMD SEV and SNP 22bda0838 runtime: Support for AMD SEV-SNP VMs a2bbd2942 kernel: Introduce SNP kernel 0e69405e1 docs: Developer-Guide updated 105eda5b9 runtime: Initrd path option added to config a8a8a28a3 runtime-rs/resource: use macro to reduce duplicated code 7622452f4 Dragonball: Fix the problem about stdio console 208233288 runtime-rs: add test for StaticResource adb33a412 packaging: fix typo in configure-hypervisor.sh f91431987 runtime: store the user name in hypervisor config 86a02c5f6 kernel: Add crypto kernel config for s390 5cafe2177 runtime: make StopVM thread-safe c3015927a runtime: add more debug logs for non-root user operation 5add50aea runtime-rs: timeout for shim management client 9f13496e1 runtime-rs: shim management client aaf6d6908 runtime-rs: call TomlConfig's validate function after load e891295e1 runtime-rs: shim management - agent-url 59aeb776b runtime-rs: shim management a828292b4 runtime-rs: add unit tests for network resource 7676cde0c workflow: trigger test-kata-deploy with pull_request f10827357 workflow: require PR num input on test-kata-deploy workflow_dispatch 428d6dc80 workflow: Revert "workflow: trigger test-kata-deploy with pull_request" Signed-off-by: Peng Tao --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e3311eab40..13997e2798 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-rc0 +3.1.0-alpha0