From 414a229310abdad10024cc840fc014b9313a109a Mon Sep 17 00:00:00 2001 From: Stefan Kurek Date: Mon, 18 Sep 2023 11:11:05 -0400 Subject: [PATCH] Adds ARM (and non-ARM) build configurations for ubuntu-2204-lts --- kokoro/config/build/presubmit/jammy.gcl | 10 ++++++++++ kokoro/config/build/presubmit/jammy_arm64.gcl | 10 ++++++++++ kokoro/config/test/image_lists.gcl | 12 ++++++++++++ kokoro/config/test/ops_agent/jammy.gcl | 8 ++++++++ kokoro/config/test/ops_agent/jammy_arm64.gcl | 9 +++++++++ kokoro/config/test/ops_agent/release/jammy_arm64.gcl | 9 +++++++++ kokoro/config/test/third_party_apps/jammy.gcl | 7 +++++++ kokoro/config/test/third_party_apps/jammy_arm64.gcl | 10 ++++++++++ .../config/test/third_party_apps/release/jammy.gcl | 7 +++++++ .../test/third_party_apps/release/jammy_arm64.gcl | 10 ++++++++++ 10 files changed, 92 insertions(+) create mode 100644 kokoro/config/build/presubmit/jammy.gcl create mode 100644 kokoro/config/build/presubmit/jammy_arm64.gcl create mode 100644 kokoro/config/test/ops_agent/jammy.gcl create mode 100644 kokoro/config/test/ops_agent/jammy_arm64.gcl create mode 100644 kokoro/config/test/ops_agent/release/jammy_arm64.gcl create mode 100644 kokoro/config/test/third_party_apps/jammy.gcl create mode 100644 kokoro/config/test/third_party_apps/jammy_arm64.gcl create mode 100644 kokoro/config/test/third_party_apps/release/jammy.gcl create mode 100644 kokoro/config/test/third_party_apps/release/jammy_arm64.gcl diff --git a/kokoro/config/build/presubmit/jammy.gcl b/kokoro/config/build/presubmit/jammy.gcl new file mode 100644 index 0000000000..83103595f0 --- /dev/null +++ b/kokoro/config/build/presubmit/jammy.gcl @@ -0,0 +1,10 @@ +import '../common.gcl' as common + +config build = common.build { + params { + environment { + DISTRO = 'jammy' + PKGFORMAT = 'deb' + } + } +} diff --git a/kokoro/config/build/presubmit/jammy_arm64.gcl b/kokoro/config/build/presubmit/jammy_arm64.gcl new file mode 100644 index 0000000000..83103595f0 --- /dev/null +++ b/kokoro/config/build/presubmit/jammy_arm64.gcl @@ -0,0 +1,10 @@ +import '../common.gcl' as common + +config build = common.build { + params { + environment { + DISTRO = 'jammy' + PKGFORMAT = 'deb' + } + } +} diff --git a/kokoro/config/test/image_lists.gcl b/kokoro/config/test/image_lists.gcl index d3a5f77476..6cc413f18b 100644 --- a/kokoro/config/test/image_lists.gcl +++ b/kokoro/config/test/image_lists.gcl @@ -63,6 +63,18 @@ jammy = _distro { 'ubuntu-2204-lts', 'ubuntu-minimal-2204-lts', ] + presubmit = [ + 'ubuntu-minimal-2204-lts', + ] +} +jammy_arm64 = _distro { + release = [ + 'ubuntu-2204-lts-arm64', + 'ubuntu-minimal-2204-lts-arm64', + ] + presubmit = [ + 'ubuntu-minimal-2204-lts-arm64', + ] } // RPM Linux distros. (Do not modify this comment.) diff --git a/kokoro/config/test/ops_agent/jammy.gcl b/kokoro/config/test/ops_agent/jammy.gcl new file mode 100644 index 0000000000..0c7e484c75 --- /dev/null +++ b/kokoro/config/test/ops_agent/jammy.gcl @@ -0,0 +1,8 @@ +import 'common.gcl' as common +import '../image_lists.gcl' as image_lists + +config build = common.ops_agent_test { + params { + platforms = image_lists.jammy.presubmit + } +} diff --git a/kokoro/config/test/ops_agent/jammy_arm64.gcl b/kokoro/config/test/ops_agent/jammy_arm64.gcl new file mode 100644 index 0000000000..b8425b9087 --- /dev/null +++ b/kokoro/config/test/ops_agent/jammy_arm64.gcl @@ -0,0 +1,9 @@ +import 'common.gcl' as common +import '../image_lists.gcl' as image_lists + +config build = common.ops_agent_test { + params { + platforms = image_lists.jammy_arm64.presubmit + arch = 'arm64' + } +} diff --git a/kokoro/config/test/ops_agent/release/jammy_arm64.gcl b/kokoro/config/test/ops_agent/release/jammy_arm64.gcl new file mode 100644 index 0000000000..677ba7ff21 --- /dev/null +++ b/kokoro/config/test/ops_agent/release/jammy_arm64.gcl @@ -0,0 +1,9 @@ +import 'common.gcl' as common +import '../../image_lists.gcl' as image_lists + +config build = common.ops_agent_test { + params { + platforms = image_lists.jammy_arm64.release + arch = 'arm64' + } +} diff --git a/kokoro/config/test/third_party_apps/jammy.gcl b/kokoro/config/test/third_party_apps/jammy.gcl new file mode 100644 index 0000000000..2127d267ca --- /dev/null +++ b/kokoro/config/test/third_party_apps/jammy.gcl @@ -0,0 +1,7 @@ +import 'common.gcl' as common + +config build = common.third_party_apps_test { + params { + platforms = ['ubuntu-2204-lts'] + } +} diff --git a/kokoro/config/test/third_party_apps/jammy_arm64.gcl b/kokoro/config/test/third_party_apps/jammy_arm64.gcl new file mode 100644 index 0000000000..b6eee23181 --- /dev/null +++ b/kokoro/config/test/third_party_apps/jammy_arm64.gcl @@ -0,0 +1,10 @@ +import 'common.gcl' as common + +config build = common.third_party_apps_test { + params { + platforms = [ + 'ubuntu-2204-lts-arm64', + ] + arch = 'arm64' + } +} diff --git a/kokoro/config/test/third_party_apps/release/jammy.gcl b/kokoro/config/test/third_party_apps/release/jammy.gcl new file mode 100644 index 0000000000..2127d267ca --- /dev/null +++ b/kokoro/config/test/third_party_apps/release/jammy.gcl @@ -0,0 +1,7 @@ +import 'common.gcl' as common + +config build = common.third_party_apps_test { + params { + platforms = ['ubuntu-2204-lts'] + } +} diff --git a/kokoro/config/test/third_party_apps/release/jammy_arm64.gcl b/kokoro/config/test/third_party_apps/release/jammy_arm64.gcl new file mode 100644 index 0000000000..b6eee23181 --- /dev/null +++ b/kokoro/config/test/third_party_apps/release/jammy_arm64.gcl @@ -0,0 +1,10 @@ +import 'common.gcl' as common + +config build = common.third_party_apps_test { + params { + platforms = [ + 'ubuntu-2204-lts-arm64', + ] + arch = 'arm64' + } +}