From 7b1028063b5b2a3b59130d1e9dbaac60d01ae2b3 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Mon, 13 Feb 2023 11:04:24 +0100 Subject: [PATCH] fix(config/jobs): fixed amazonlinux2 aarch64 build-drivers job. Signed-off-by: Federico Di Pierro --- .../build-drivers/build-new-amazonlinux.yaml | 6 +- .../build-drivers/build-new-bottlerocket.yaml | 102 ++---------------- .../jobs/build-drivers/build-new-centos.yaml | 31 +----- .../build-drivers/build-new-ubuntu-aws.yaml | 2 +- 4 files changed, 11 insertions(+), 130 deletions(-) diff --git a/config/jobs/build-drivers/build-new-amazonlinux.yaml b/config/jobs/build-drivers/build-new-amazonlinux.yaml index 9ecf0d11a98..8afbbaa7d23 100644 --- a/config/jobs/build-drivers/build-new-amazonlinux.yaml +++ b/config/jobs/build-drivers/build-new-amazonlinux.yaml @@ -148,13 +148,13 @@ postsubmits: agent: kubernetes branches: - ^master$ - run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/aarch64/amazonlinux_*' + run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/aarch64/amazonlinux2_*' spec: serviceAccountName: driver-kit containers: - command: - /workspace/build-drivers.sh - - amazonlinux + - amazonlinux2 env: - name: AWS_REGION value: eu-west-1 @@ -169,4 +169,4 @@ postsubmits: cpu: 1500m #m5large is 2vpcu and 8gb ram so this 75% of a node memory: 6Gi nodeSelector: - Archtype: "arm" \ No newline at end of file + Archtype: "arm" diff --git a/config/jobs/build-drivers/build-new-bottlerocket.yaml b/config/jobs/build-drivers/build-new-bottlerocket.yaml index a68e5f223f0..0020f2c9ef3 100644 --- a/config/jobs/build-drivers/build-new-bottlerocket.yaml +++ b/config/jobs/build-drivers/build-new-bottlerocket.yaml @@ -1,19 +1,18 @@ presubmits: falcosecurity/test-infra: - - name: validate-new-drivers-bottlerocket-4-presubmit + - name: validate-new-drivers-bottlerocket-presubmit decorate: true skip_report: false agent: kubernetes branches: - ^master$ - run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/(.+/)?bottlerocket_4*' + run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/(.+/)?bottlerocket*' spec: serviceAccountName: driver-kit containers: - command: - /workspace/build-drivers.sh - bottlerocket - - "4.*" env: - name: AWS_REGION value: eu-west-1 @@ -29,51 +28,21 @@ presubmits: memory: 6Gi nodeSelector: Archtype: "x86" - - name: validate-new-drivers-bottlerocket-5-presubmit - decorate: true - skip_report: false - agent: kubernetes - branches: - - ^master$ - run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/(.+/)?bottlerocket_5*' - spec: - serviceAccountName: driver-kit - containers: - - command: - - /workspace/build-drivers.sh - - bottlerocket - - "5.*" - env: - - name: AWS_REGION - value: eu-west-1 - - name: DBG_MAKE_BUILD_TARGET - value: validate - image: 292999226676.dkr.ecr.eu-west-1.amazonaws.com/test-infra/build-drivers:latest - imagePullPolicy: Always - securityContext: - privileged: true - resources: - requests: - cpu: 1500m #m5large is 2vpcu and 8gb ram so this 75% of a node - memory: 6Gi - nodeSelector: - Archtype: "x86" postsubmits: falcosecurity/test-infra: - - name: build-new-drivers-bottlerocket-4-postsubmit + - name: build-new-drivers-bottlerocket-postsubmit decorate: true skip_report: false agent: kubernetes branches: - ^master$ - run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/x86_64/bottlerocket_4*' + run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/x86_64/bottlerocket*' spec: serviceAccountName: driver-kit containers: - command: - /workspace/build-drivers.sh - bottlerocket - - "4.*" env: - name: AWS_REGION value: eu-west-1 @@ -89,20 +58,19 @@ postsubmits: memory: 6Gi nodeSelector: Archtype: "x86" - - name: build-new-drivers-bottlerocket-4-postsubmit-arm + - name: build-new-drivers-bottlerocket-postsubmit-arm decorate: true skip_report: false agent: kubernetes branches: - ^master$ - run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/aarch64/bottlerocket_4*' + run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/aarch64/bottlerocket*' spec: serviceAccountName: driver-kit containers: - command: - /workspace/build-drivers.sh - bottlerocket - - "4.*" env: - name: AWS_REGION value: eu-west-1 @@ -118,61 +86,3 @@ postsubmits: memory: 6Gi nodeSelector: Archtype: "arm" - - name: build-new-drivers-bottlerocket-5-postsubmit - decorate: true - skip_report: false - agent: kubernetes - branches: - - ^master$ - run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/x86_64/bottlerocket_5*' - spec: - serviceAccountName: driver-kit - containers: - - command: - - /workspace/build-drivers.sh - - bottlerocket - - "5.*" - env: - - name: AWS_REGION - value: eu-west-1 - - name: PUBLISH_S3 - value: "true" - image: 292999226676.dkr.ecr.eu-west-1.amazonaws.com/test-infra/build-drivers:latest - imagePullPolicy: Always - securityContext: - privileged: true - resources: - requests: - cpu: 1500m #m5large is 2vpcu and 8gb ram so this 75% of a node - memory: 6Gi - nodeSelector: - Archtype: "x86" - - name: build-new-drivers-bottlerocket-5-postsubmit-arm - decorate: true - skip_report: false - agent: kubernetes - branches: - - ^master$ - run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/aarch64/bottlerocket_5*' - spec: - serviceAccountName: driver-kit - containers: - - command: - - /workspace/build-drivers.sh - - bottlerocket - - "5.*" - env: - - name: AWS_REGION - value: eu-west-1 - - name: PUBLISH_S3 - value: "true" - image: 292999226676.dkr.ecr.eu-west-1.amazonaws.com/test-infra/build-drivers:latest - imagePullPolicy: Always - securityContext: - privileged: true - resources: - requests: - cpu: 1500m #m5large is 2vpcu and 8gb ram so this 75% of a node - memory: 6Gi - nodeSelector: - Archtype: "arm" \ No newline at end of file diff --git a/config/jobs/build-drivers/build-new-centos.yaml b/config/jobs/build-drivers/build-new-centos.yaml index 40299dfaffa..1c8e1175cb5 100644 --- a/config/jobs/build-drivers/build-new-centos.yaml +++ b/config/jobs/build-drivers/build-new-centos.yaml @@ -147,35 +147,6 @@ postsubmits: memory: 6Gi nodeSelector: Archtype: "x86" - - name: build-new-drivers-centos-2-postsubmit-arm - decorate: true - skip_report: false - agent: kubernetes - branches: - - ^master$ - run_if_changed: '^driverkit/config/[a-z0-9.+-]{5,}/aarch64/centos_2*' - spec: - serviceAccountName: driver-kit - containers: - - command: - - /workspace/build-drivers.sh - - centos - - "2.*" - env: - - name: AWS_REGION - value: eu-west-1 - - name: PUBLISH_S3 - value: "true" - image: 292999226676.dkr.ecr.eu-west-1.amazonaws.com/test-infra/build-drivers:latest - imagePullPolicy: Always - securityContext: - privileged: true - resources: - requests: - cpu: 1500m #m5large is 2vpcu and 8gb ram so this 75% of a node - memory: 6Gi - nodeSelector: - Archtype: "arm" - name: build-new-drivers-centos-3-postsubmit decorate: true skip_report: false @@ -349,4 +320,4 @@ postsubmits: cpu: 1500m #m5large is 2vpcu and 8gb ram so this 75% of a node memory: 6Gi nodeSelector: - Archtype: "arm" \ No newline at end of file + Archtype: "arm" diff --git a/config/jobs/build-drivers/build-new-ubuntu-aws.yaml b/config/jobs/build-drivers/build-new-ubuntu-aws.yaml index badc5e80ab6..3c15cfc074c 100644 --- a/config/jobs/build-drivers/build-new-ubuntu-aws.yaml +++ b/config/jobs/build-drivers/build-new-ubuntu-aws.yaml @@ -262,4 +262,4 @@ postsubmits: cpu: 1500m #m5large is 2vpcu and 8gb ram so this 75% of a node memory: 6Gi nodeSelector: - Archtype: "arm" \ No newline at end of file + Archtype: "arm"