Skip to content

Commit

Permalink
kbs: tidy ci yaml files
Browse files Browse the repository at this point in the history
Combined Azure vTPM ci yamls. Also rename the ci pipelines with a
unified name format for better preference.

Signed-off-by: Xynnn007 <[email protected]>
  • Loading branch information
Xynnn007 committed Jun 25, 2024
1 parent 4fcd543 commit 9591657
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 100 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/actionlint.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: actionlint
name: Actionlint
on: [pull_request]
jobs:
actionlint:
name: lint workflow files
name: Workflow Files
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/as-dockerbuild.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: AS & RVPS Container image build test
name: AS & RVPS Container Image Build
on:
push:
branches:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/as-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.RUSTC_VERSION }}
- name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
run: |
rustup update --no-self-update ${{ env.RUSTC_VERSION }}
rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustc
rustup default ${{ env.RUSTC_VERSION }}
- uses: actions/setup-go@v5
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: attestation-service basic build and unit tests
name: CoCo-AS Rust Suites
on:
push:
branches:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/kbs-docker-build.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
name: KBS Container Image Build
on:
push:
branches: [ "main" ]
Expand All @@ -7,7 +8,7 @@ on:
jobs:
ci:
runs-on: ubuntu-latest

name: Check
steps:
- name: Code checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kbs-docker-e2e.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: KBS End-to-End test with Docker Compose and Sample Attester
name: KBS e2e (Docker Compose and Sample TEE)

on:
pull_request:
Expand Down
65 changes: 0 additions & 65 deletions .github/workflows/kbs-e2e-az-snp-vtpm.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: KBS e2e with az-tdx-vtpm TEE
name: KBS e2e (Azure vTPM TEE)

on:
push:
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
with:
path: ./kbs.tar.gz

e2e-test:
tdx-e2e-test:
needs:
- authorize
- checkout-and-rebase
Expand All @@ -63,3 +63,13 @@ jobs:
runs-on: '["self-hosted","azure-cvm-tdx"]'
tee: aztdxvtpm
tarball: kbs.tar.gz

snp-e2e-test:
needs:
- authorize
- checkout-and-rebase
uses: ./.github/workflows/kbs-e2e.yaml
with:
runs-on: '["self-hosted","azure-cvm"]'
tee: azsnpvtpm
tarball: kbs.tar.gz
2 changes: 1 addition & 1 deletion .github/workflows/kbs-e2e-sample.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: KBS e2e with sample TEE
name: KBS e2e (Sample TEE)

on:
pull_request:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/kbs-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ jobs:
- name: Extract tarball
run: tar xzf ./artifact/${{ inputs.tarball }}

- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.RUSTC_VERSION }}
- name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
run: |
rustup update --no-self-update ${{ env.RUSTC_VERSION }}
rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustc
rustup default ${{ env.RUSTC_VERSION }}
- name: Set up rust build cache
uses: actions/cache@v4
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/kbs-rust.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: kbs rust tests
name: KBS Rust Suites

on:
push:
Expand All @@ -19,6 +19,7 @@ env:

jobs:
ci:
name: Check
strategy:
fail-fast: false
env:
Expand All @@ -29,14 +30,12 @@ jobs:
- name: Code checkout
uses: actions/checkout@v4

- name: Rust toolchain installation
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.RUSTC_VERSION }}
override: true
components: rustfmt, clippy
target: x86_64-unknown-linux-gnu
- name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
run: |
rustup update --no-self-update ${{ env.RUSTC_VERSION }}
rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustfmt rustc clippy
rustup target add x86_64-unknown-linux-gnu
rustup default ${{ env.RUSTC_VERSION }}
- name: Building dependencies installation
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/link.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: check links
name: Check Links

on:
push:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and push kbs-client
name: Build and Push kbs-client

on:
push:
Expand Down Expand Up @@ -31,22 +31,25 @@ jobs:
- name: Check out code
uses: actions/checkout@v4
- name: Install rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.RUSTC_VERSION }}
override: true
profile: minimal

- name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
run: |
rustup update --no-self-update ${{ env.RUSTC_VERSION }}
rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustc
rustup default ${{ env.RUSTC_VERSION }}
- name: Log in to ghcr.io
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build a statically linked kbs-client for ${{ matrix.arch }} linux
working-directory: kbs
run: |
make cli-static-linux
- name: Push to ghcr.io
working-directory: target/${{ matrix.arch }}-unknown-linux-gnu/release
run: |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Push kbs Image
name: Build and Push KBS Image

on:
push:
Expand Down

0 comments on commit 9591657

Please sign in to comment.