From 6ce59e6bc3e0b72de2683d1e679a2535ba94dc2e Mon Sep 17 00:00:00 2001 From: Robert Kielty Date: Wed, 5 Mar 2025 16:32:06 +0000 Subject: [PATCH 1/2] fixes typos Signed-off-by: Robert Kielty --- ci/README.MD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ci/README.MD b/ci/README.MD index b898b80..9f2f066 100644 --- a/ci/README.MD +++ b/ci/README.MD @@ -9,13 +9,13 @@ defined here for CI jobs. ## Custom runners We have created two custom runners that allow us to run any containerizable CI -job on both x86_64/amd64 and arm63 Architechtures. +job on both x86_64/amd64 and arm64 Architectures. In a Github Action workflow, you can define multiple jobs and for each of those -jobs you choose a runner. +jobs you choose a runner. -We have defined two 16CPU/64GB runners that can used by adding either of the -following statements to your job definitions: +We have defined two 16CPU/64GB runners that CNCF Projects can use by adding +either of the following statements to your job definitions: **For an amd64/x86_64 runner use:** @@ -27,6 +27,7 @@ following statements to your job definitions: ## Runner definition -The above runners are defined in this repo <./gha-runner-image/Dockerfile> +The above runners are defined in this [Dockerfile](./gha-runner-image/Dockerfile) You can review the Dockerfile to see what tools have been added to the runner image. + From edf3e1d0d7c6380ac71c9ca10b798f1d4259d983 Mon Sep 17 00:00:00 2001 From: Robert Kielty Date: Mon, 10 Mar 2025 15:44:08 +0000 Subject: [PATCH 2/2] adds .m2 pv, updates README, test action to cover new runners Signed-off-by: Robert Kielty --- .github/workflows/test-oracle-runners.yaml | 17 +++++++++++------ ci/README.MD | 10 +++++++--- .../oci-arm64/runners/16cpu-64gb/values.yaml | 5 ++++- .../oci-arm64/runners/2cpu-8gb/values.yaml | 5 ++++- .../oci-arm64/runners/32cpu-128gb/values.yaml | 5 ++++- ci/cluster/oci/runners/16cpu-64gb/values.yaml | 5 ++++- ci/cluster/oci/runners/24cpu-384gb/values.yaml | 5 ++++- ci/cluster/oci/runners/4cpu-16gb/values.yaml | 5 ++++- ci/cluster/oci/runners/8cpu-32gb/values.yaml | 5 ++++- 9 files changed, 46 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test-oracle-runners.yaml b/.github/workflows/test-oracle-runners.yaml index 82a7511..cfab72d 100644 --- a/.github/workflows/test-oracle-runners.yaml +++ b/.github/workflows/test-oracle-runners.yaml @@ -1,4 +1,4 @@ -name: Test oracle-16cpu-64gb-x86-64 +name: Test all Oracle Runners on: push: @@ -7,25 +7,30 @@ on: workflow_dispatch: jobs: - test-runner: - runs-on: oracle-16cpu-64gb-x86-64 + cncf_ora_rnrs_matrix: + strategy: + matrix: + cncf_runner: [oracle-16cpu-64gb-x86-64, oracle-16cpu-64gb-arm64, oracle-4cpu-16gb-x86-64, oracle-8cpu-32gb-x86-64, oracle-24cpu-384gb-x86-64, oracle-2cpu-8gb-arm64, oracle-32cpu-128gb-arm64] + + runs-on: ${{ matrix.cncf_runner }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run uname to verify architecture run: uname -a - name: Run a basic workload run: | - echo "Testing Oracle Runner" + echo "Testing Oracle runner ${{matrix.cncf_runner}}" echo "CPU Info:" lscpu - name: Run a Docker container run: | - docker run --rm alpine echo "Docker is working on the runner" + docker run --rm alpine echo "Docker is working on ${{matrix.cncf_runner}}" - name: Check local disk run: | + echo "df -h on ${{matrix.cncf_runner}}" df -h / diff --git a/ci/README.MD b/ci/README.MD index 9f2f066..6730410 100644 --- a/ci/README.MD +++ b/ci/README.MD @@ -17,17 +17,21 @@ jobs you choose a runner. We have defined two 16CPU/64GB runners that CNCF Projects can use by adding either of the following statements to your job definitions: -**For an amd64/x86_64 runner use:** +**For an amd64/x86_64 runner you can choose from:** +`runs-on: oracle-4cpu-16gb-x86-64` +`runs-on: oracle-8cpu-32gb-x86-64` `runs-on: oracle-16cpu-64gb-x86-64` +`runs-on: oracle-24cpu-384gb-x86-64` -**For an arm64 runner** +**For an arm64 runner choose one of:** +`runs-on: oracle-2cpu-8gb-arm64` `runs-on: oracle-16cpu-64gb-arm64` +`runs-on: oracle-32cpu-128gb-arm64` ## Runner definition The above runners are defined in this [Dockerfile](./gha-runner-image/Dockerfile) You can review the Dockerfile to see what tools have been added to the runner image. - diff --git a/ci/cluster/oci-arm64/runners/16cpu-64gb/values.yaml b/ci/cluster/oci-arm64/runners/16cpu-64gb/values.yaml index 7ffe1ea..1ad4de6 100644 --- a/ci/cluster/oci-arm64/runners/16cpu-64gb/values.yaml +++ b/ci/cluster/oci-arm64/runners/16cpu-64gb/values.yaml @@ -193,6 +193,9 @@ template: - name: work mountPath: /home/runner/go subPath: go + - name: work + mountPath: /home/runner/.m2 + subPath: .m2 - name: dind image: docker:dind args: @@ -234,4 +237,4 @@ template: storageClassName: oci-bv resources: requests: - storage: 10Gi \ No newline at end of file + storage: 10Gi diff --git a/ci/cluster/oci-arm64/runners/2cpu-8gb/values.yaml b/ci/cluster/oci-arm64/runners/2cpu-8gb/values.yaml index 889699e..815a922 100644 --- a/ci/cluster/oci-arm64/runners/2cpu-8gb/values.yaml +++ b/ci/cluster/oci-arm64/runners/2cpu-8gb/values.yaml @@ -193,6 +193,9 @@ template: - name: work mountPath: /home/runner/go subPath: go + - name: work + mountPath: /home/runner/.m2 + subPath: .m2 - name: dind image: docker:dind args: @@ -234,4 +237,4 @@ template: storageClassName: oci-bv resources: requests: - storage: 10Gi \ No newline at end of file + storage: 10Gi diff --git a/ci/cluster/oci-arm64/runners/32cpu-128gb/values.yaml b/ci/cluster/oci-arm64/runners/32cpu-128gb/values.yaml index ffd96af..3f62958 100644 --- a/ci/cluster/oci-arm64/runners/32cpu-128gb/values.yaml +++ b/ci/cluster/oci-arm64/runners/32cpu-128gb/values.yaml @@ -193,6 +193,9 @@ template: - name: work mountPath: /home/runner/go subPath: go + - name: work + mountPath: /home/runner/.m2 + subPath: .m2 - name: dind image: docker:dind args: @@ -234,4 +237,4 @@ template: storageClassName: oci-bv resources: requests: - storage: 10Gi \ No newline at end of file + storage: 10Gi diff --git a/ci/cluster/oci/runners/16cpu-64gb/values.yaml b/ci/cluster/oci/runners/16cpu-64gb/values.yaml index 7ffe1ea..1ad4de6 100644 --- a/ci/cluster/oci/runners/16cpu-64gb/values.yaml +++ b/ci/cluster/oci/runners/16cpu-64gb/values.yaml @@ -193,6 +193,9 @@ template: - name: work mountPath: /home/runner/go subPath: go + - name: work + mountPath: /home/runner/.m2 + subPath: .m2 - name: dind image: docker:dind args: @@ -234,4 +237,4 @@ template: storageClassName: oci-bv resources: requests: - storage: 10Gi \ No newline at end of file + storage: 10Gi diff --git a/ci/cluster/oci/runners/24cpu-384gb/values.yaml b/ci/cluster/oci/runners/24cpu-384gb/values.yaml index 512e543..7a50318 100644 --- a/ci/cluster/oci/runners/24cpu-384gb/values.yaml +++ b/ci/cluster/oci/runners/24cpu-384gb/values.yaml @@ -193,6 +193,9 @@ template: - name: work mountPath: /home/runner/go subPath: go + - name: work + mountPath: /home/runner/.m2 + subPath: .m2 - name: dind image: docker:dind args: @@ -234,4 +237,4 @@ template: storageClassName: oci-bv resources: requests: - storage: 10Gi \ No newline at end of file + storage: 10Gi diff --git a/ci/cluster/oci/runners/4cpu-16gb/values.yaml b/ci/cluster/oci/runners/4cpu-16gb/values.yaml index 0d1c540..e3eeb80 100644 --- a/ci/cluster/oci/runners/4cpu-16gb/values.yaml +++ b/ci/cluster/oci/runners/4cpu-16gb/values.yaml @@ -193,6 +193,9 @@ template: - name: work mountPath: /home/runner/go subPath: go + - name: work + mountPath: /home/runner/.m2 + subPath: .m2 - name: dind image: docker:dind args: @@ -234,4 +237,4 @@ template: storageClassName: oci-bv resources: requests: - storage: 10Gi \ No newline at end of file + storage: 10Gi diff --git a/ci/cluster/oci/runners/8cpu-32gb/values.yaml b/ci/cluster/oci/runners/8cpu-32gb/values.yaml index e7468d8..eee749c 100644 --- a/ci/cluster/oci/runners/8cpu-32gb/values.yaml +++ b/ci/cluster/oci/runners/8cpu-32gb/values.yaml @@ -193,6 +193,9 @@ template: - name: work mountPath: /home/runner/go subPath: go + - name: work + mountPath: /home/runner/.m2 + subPath: .m2 - name: dind image: docker:dind args: @@ -234,4 +237,4 @@ template: storageClassName: oci-bv resources: requests: - storage: 10Gi \ No newline at end of file + storage: 10Gi