This is an automated email from the ASF dual-hosted git repository. shahar1 pushed a commit to branch gha-arc-rebase in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git
commit 8db4828742000f234eb51483d88026394f27e39d Author: hussein-awala <[email protected]> AuthorDate: Tue Sep 3 01:13:13 2024 +0200 reviews + fix docker image --- README.rst | 3 ++- helm/{ci.yaml => ci-helmfile.yaml} | 0 helm/values/gha-runner-scale-sets/runners.yaml | 2 +- runner/Dockerfile | 2 +- terraform/eks/.terraform-version | 1 + terraform/eks/vpc.tf | 1 - 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 12fa8ef..729c657 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,8 @@ Apache Airflow uses Github Actions as its Continuous Integration (CI) tool. When request, Github Actions runs a series of tests on Apache organization runners. However, due to the limited resources of these runners, the tests could take a significant amount of time, sometimes up to 2 hours. To improve efficiency for active committers, a separate set of runners is available for them. These CI runs are executed on self-hosted -runners deployed on an Amazon Elastic Kubernetes Service (EKS) cluster. +runners deployed on an Amazon Elastic Kubernetes Service (EKS) cluster, using +[Actions Runner Controller](https://github.com/actions/actions-runner-controller) (ARC). This repository contains the necessary scripts and configuration files for managing the CI infrastructure of Apache Airflow. diff --git a/helm/ci.yaml b/helm/ci-helmfile.yaml similarity index 100% rename from helm/ci.yaml rename to helm/ci-helmfile.yaml diff --git a/helm/values/gha-runner-scale-sets/runners.yaml b/helm/values/gha-runner-scale-sets/runners.yaml index 40268eb..3c475fe 100644 --- a/helm/values/gha-runner-scale-sets/runners.yaml +++ b/helm/values/gha-runner-scale-sets/runners.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. --- -image: ghcr.io/apache/airflow-ci-infra/actions-runner:20240830-rc1 +image: ghcr.io/apache/airflow-ci-infra/actions-runner:20240902-rc1 runnerScaleSets: arc-small-amd: minRunners: 0 diff --git a/runner/Dockerfile b/runner/Dockerfile index 05daa82..683028a 100644 --- a/runner/Dockerfile +++ b/runner/Dockerfile @@ -21,7 +21,7 @@ USER root RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates curl nodejs npm wget unzip vim git jq build-essential netcat \ + ca-certificates curl nodejs npm wget unzip vim git jq build-essential netcat subversion \ libssl-dev libffi-dev python3 python3-venv python3-dev python3-pip python-is-python3 \ && npm install -g yarn \ && install -m 0755 -d /etc/apt/keyrings \ diff --git a/terraform/eks/.terraform-version b/terraform/eks/.terraform-version new file mode 100644 index 0000000..158c747 --- /dev/null +++ b/terraform/eks/.terraform-version @@ -0,0 +1 @@ +1.9.5 diff --git a/terraform/eks/vpc.tf b/terraform/eks/vpc.tf index d3656c5..1d80025 100644 --- a/terraform/eks/vpc.tf +++ b/terraform/eks/vpc.tf @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. -# TODO: use the existing VPC? module "vpc" { source = "terraform-aws-modules/vpc/aws" version = "5.13.0"
