Fix conflict

Signed-off-by: higuruchi <fumiya2324@gmail.com>
youki-dev · Jul 28, 2023 · 6abbf3d · 6abbf3d
2 parents 2f037c4 + 149860c
commit 6abbf3d
Show file tree

Hide file tree

Showing 239 changed files with 14,005 additions and 6,762 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,21 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot
+  categories:
+    - title: 💪 Improvements
+      labels:
+        - kind/feature
+    - title: 🐛 Bug Fixes
+      labels:
+        - kind/bug
+    - title: 📖 Documentation improvements
+      labels:
+        - kind/documentation
+    - title: 🧪 Test improvements and Misc Fixes
+      labels:
+        - kind/test
+        - kind/cleanup
+    - title: Other Changes
+      labels:
+        - "*"
diff --git a/.github/workflows/benchmark_execution_time.yml b/.github/workflows/benchmark_execution_time.yml
@@ -14,20 +14,17 @@ jobs:
       - name: Checkout to PR branch
         uses: actions/checkout@v3
 
-      - name: Setup Linux env
-        run: |
-          sudo apt -y update
-          sudo apt install libsystemd-dev librust-libdbus-sys-dev libseccomp-dev
+      - name: Install requirements
+        run: sudo ./.github/scripts/dependency.sh
 
-      - name: Setting rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          profile: minimal
+      - name: Setup Rust toolchain and cache
+        uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+
+      - name: Install Just
+        uses: taiki-e/install-action@just
 
       - name: Building PR branch
-        run: make youki-release
+        run: just youki-release
 
       - name: Uploading PR build to artifact
         uses: actions/upload-artifact@v2
@@ -46,20 +43,16 @@ jobs:
         with:
           ref: main
 
-      - name: Setup Linux env
-        run: |
-          sudo apt -y update
-          sudo apt install libsystemd-dev librust-libdbus-sys-dev libseccomp-dev
+      - name: Install requirements
+        run: sudo ./.github/scripts/dependency.sh
 
-      - name: Setting rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          profile: minimal
+      - name: Setup Rust toolchain and cache
+        uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+      - name: Install just
+        uses: taiki-e/install-action@just
 
       - name: Building main branch
-        run: make youki-release
+        run: just youki-release
 
       - name: Uploading main build to artifact
         uses: actions/upload-artifact@v2

diff --git a/.github/workflows/containerd_integration_tests.yaml b/.github/workflows/containerd_integration_tests.yaml
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -0,0 +1,129 @@
+name: 🧪 e2e test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  youki-build:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Rust toolchain and cache
+        uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+      - name: Install just
+        uses: taiki-e/install-action@just
+      - name: Install requirements
+        run: sudo env PATH=$PATH just ci-prepare
+      - name: Build youki
+        run: just youki-release
+      - name: Upload youki binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: youki
+          path: youki
+
+  containerd-integration-tests:
+    runs-on: ubuntu-22.04
+    needs: [youki-build]
+    timeout-minutes: 40
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: containerd/containerd
+          ref: v1.6.20
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.19.9'
+          cache: true
+      - run: sudo apt-get -y update
+      - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev btrfs-progs libbtrfs-dev
+      - name: Build containerd
+        run: |
+          make build
+          make binaries
+      - name: Download youki binary
+        uses: actions/download-artifact@v3
+        with:
+          name: youki
+      - name: Replace runc to youki
+        run: |
+          sudo rm -f /usr/bin/runc /usr/local/bin/runc /usr/sbin/runc
+          sudo chmod 755 youki
+          sudo cp youki /usr/bin/runc
+          runc --version
+      - name: Integration Test
+        run: sudo make TEST_RUNTIME=io.containerd.runc.v2 TESTFLAGS="-timeout 40m" integration
+
+  k8s-tests:
+    runs-on: ubuntu-22.04
+    needs: [youki-build]
+    timeout-minutes: 40
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download youki binary
+        uses: actions/download-artifact@v3
+        with:
+          name: youki
+      - name: Add the permission to run
+        run: chmod +x ./youki
+      - name: Install just
+        uses: taiki-e/install-action@just
+      - name: test/k8s/deploy
+        run: just test-kind
+
+  oci-validation-go:
+    runs-on: ubuntu-22.04
+    needs: [youki-build]
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Setup Rust toolchain and cache
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install just
+        uses: taiki-e/install-action@just
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.19.9'
+          cache: true
+          cache-dependency-path: tests/oci-runtime-tests/src/github.com/opencontainers/runtime-tools/go.sum
+      - name: Download youki binary
+        uses: actions/download-artifact@v3
+        with:
+          name: youki
+      - name: Add the permission to run
+        run: chmod +x ./youki
+      - name: Run integration tests
+        run: just oci-tests
+
+  oci-validation-rust:
+    runs-on: ubuntu-22.04
+    needs: [youki-build]
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Setup Rust toolchain and cache
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install just
+        uses: taiki-e/install-action@just
+      - name: Install requirements
+        run: sudo env PATH=$PATH just ci-prepare
+      - name: Download youki binary
+        uses: actions/download-artifact@v3
+        with:
+          name: youki
+      - name: Add the permission to run
+        run: chmod +x ./youki
+      - name: Build
+        run: just runtimetest rust-oci-tests-bin
+      - name: Validate tests on youki
+        run: just rust-oci-tests
diff --git a/.github/workflows/integration_tests_validation.yaml b/.github/workflows/integration_tests_validation.yaml
@@ -5,46 +5,48 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   changes:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 15
     outputs:
-      dirs: ${{ steps.filter.outputs.changes }}
+      any_modified: ${{ steps.filter.outputs.any_modified }}
     steps:
       - uses: actions/checkout@v3
-      - uses: dorny/paths-filter@v2
+      - uses: tj-actions/changed-files@v36
         id: filter
         with:
-          filters: |
-            ./integration_test: ./tests/rust-integration-tests/**
+          files: |
+            .github/workflows/integration_tests_validation.yaml
+            tests/rust-integration-tests/**
+          files_ignore: |
+            **.md
+      - name: List all changed files
+        run: |
+          for file in ${{ steps.filter.outputs.all_modified_files }}; do
+            echo "$file was changed"
+          done
   validate:
     needs: [changes]
-    if: ${{ !contains(needs.changes.outputs.dirs, '[]') }}
+    if: needs.changes.outputs.any_modified == 'true'
     runs-on: ubuntu-20.04
-    timeout-minutes: 15
-    strategy:
-      matrix:
-        rust: [1.66.0, 1.67.0]
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ matrix.rust }}
-          override: true
-      - name: Cache youki
-        uses: Swatinem/rust-cache@v1
-      - run: sudo apt-get -y update
-      - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
+      - name: Setup Rust toolchain and cache
+        uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+      - name: Install just
+        uses: taiki-e/install-action@just
+      - name: Install requirements
+        run: sudo env PATH=$PATH just ci-prepare
       - name: Install runc 1.1.0
         run: |
           wget -q https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.amd64
           sudo mv runc.amd64 /usr/bin/runc
           sudo chmod 755 /usr/bin/runc
       - name: Build
-        run: make youki-release runtimetest rust-oci-tests-bin
+        run: just runtimetest rust-oci-tests-bin
       - name: Validate tests on runc
-        run: make validate-rust-oci-runc
-      - name: Validate tests on youki
-        run: make rust-oci-tests
+        run: just validate-rust-oci-runc
diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml
@@ -0,0 +1,17 @@
+name: 🏷️ Pull Request Labels
+
+on:
+  pull_request:
+    types: [opened, labeled, unlabeled, synchronize]
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: mheap/github-action-required-labels@v5
+        with:
+          mode: exactly
+          count: 1
+          labels: "kind/feature, kind/bug, kind/documentation, kind/test, kind/cleanup, dependencies"