main | Introduce Jenkins Job Builder for CI #406

wainersm · 2021-11-10T15:10:45Z

This introduces the files and scripts to use with Jenkins
Job Builder to manage our CI jobs.

As a proof of concept, it is generated only four jobs:
kata-containers-main-kernel-experimental-x86_64
kata-containers-main-kernel-vanilla-x86_64
kata-containers-main-qemu-x86_64
kata-containers-stable-2.2-qemu-x86_64

Fixes #343
Signed-off-by: Wainer dos Santos Moschetta wainersm@redhat.com
(cherry-picked from commit a22049c)

wainersm · 2021-11-10T15:13:38Z

@jodh-intel @GabyCT just now I noticed the #359 was opened against the unused 2.0-dev branch :) So this is just a forward-port....

fidencio

@wainersm. the idea looks reasonable to me, but I've left a bunch of comments, mostly about the distros / branches we don't support anymore.

jobs-builder/jobs/include/os2node.yaml.inc

jobs-builder/jobs/dependencies.yaml

wainersm · 2021-11-10T18:59:11Z

@fidencio thanks for the review! Mind if I update this PR with another commit on top of the original?

fidencio · 2021-11-10T21:41:13Z

@fidencio thanks for the review! Mind if I update this PR with another commit on top of the original?

That's fine, let me know when you update and I can check the other commit.

jodh-intel

Thanks @wainersm. A few more comments. Let's see if we can get this landed early January!

jobs-builder/publish_jobs.sh

jobs-builder/jobs/dependencies.yaml

jobs-builder/jobs/include/os2node.yaml.inc

jobs-builder/jobs/dependencies.yaml

jodh-intel · 2021-12-23T10:55:05Z

jobs-builder/jobs/dependencies.yaml

+            export branch="{{branch}}"
+            export target_branch="$branch"
+            {% if flavor == "experimental" -%}
+            export experimental_kernel=true


This was changed to build_type on kata-containers/kata-containers#2519.

@jodh-intel I will change it to build_type but I have some doubts... is there any CI job using that?

I see tests/.ci/install_kata_kernel.sh has not references to build_type or experimental_kernel. I am almost sure that script used to deal with cached experimental kernel. In the end, do we need a job for caching the experimental kernel?

Cc @jcvenegas

jodh-intel · 2021-12-23T10:55:58Z

jobs-builder/jobs/dependencies.yaml

+    name: kata-containers-{branch}-qemu-{arch}
+    <<: *common_job_properties
+    maintainers:
+      - Wainer dos Santos Moschetta <wainersm@redhat.com>


You're brave! I'd be templted to either remove this section or put in a generic email address to avoid getting pinged for the rest of your life! 😄

This introduces the files and scripts to use with Jenkins Job Builder to manage our CI jobs. As a proof of concept, it is generated only four jobs: kata-containers-main-kernel-experimental-x86_64 kata-containers-main-kernel-vanilla-x86_64 kata-containers-main-qemu-x86_64 kata-containers-stable-2.2-qemu-x86_64 Fixes kata-containers#343 Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com> (cherry-picked from commit a22049c)

Updated the OS to node mapping file: - removed rhel8, debian and sles as they haven't CI jobs anymore - ARM jobs use Ubuntu 20.04 - jobs with label ubuntu1804_azure or ubuntu1804-azure should get a Ubuntu 18.04 VM Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

Instead we should be building QEMU for stable-2.3 Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

Added errexit and friends to publish_jobs.sh Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

Updated the QEMU and Kernel templates so that: - golang package isn't installed - go installed with install_go.sh is searcheable - add more shell debug flags - kernel experimental job uses the new `build_type` variable Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

Our Jenkins is configured to render the job description as HTML, so this changed the description of all jobs properly. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

It is added a minus sign (-) in the control flow statements of os2node.yaml.inc so that newlines are striped off. Otherwise the output will contain newline characters which can end up messing with the generated XML representation of the jobs. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

Make the spell checker happy. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

wainersm · 2021-12-29T13:55:06Z

Updated this PR to address your comments, @fidencio , @jodh-intel , @jongwu. Also I could make the static check pass.

wainersm · 2021-12-29T13:56:28Z

The list of generated jobs with the job builder can be found at http://jenkins.katacontainers.io/view/JJB%20managed/

fidencio · 2022-01-04T10:15:19Z

@wainersm, amazing work on this one. Please, just update the fedora32 usage to a newer one (matching with what Snir added) and we're good to go from my side.

jodh-intel · 2022-01-04T13:42:16Z

jobs-builder/jobs/dependencies.yaml

+            export target_branch="$branch"
+            {% if flavor == "experimental" -%}


Related: https://github.com/kata-containers/kata-containers/pull/3281/files#r774708927

jodh-intel

Thanks @wainersm.

Once @fidencio's Fedora comment is addressed...

lgtm

jobs-builder/jobs/dependencies.yaml

jongwu · 2022-01-05T03:24:46Z

jobs-builder/jobs/dependencies.yaml

            source ci/lib.sh
            export branch="{{branch}}"
            export target_branch="$branch"
            {% if flavor == "experimental" -%}
-            export experimental_kernel=true
+            export build_type="experimental"


Hello @wainersm . I want to add a new arch-specific build_type, maybe it can be called "arch-experimental", to distinguish with this comment one. So, what about exporting this new build_type here?
I'm trying to do this here, but have not settled down.
@jodh-intel

@jodh-intel @jongwu

it's been a moving target :) What do you prefer:
a) merge as is; send a follow up when things are settle down
b) keep changing and merge after a settlement

I'm in favor of a)

@jodh-intel @wainersm -, I'm fine for a). let's do the following after it settles down.

@wainersm, @jongwu - (a) wfm too! ;)

great! done!

The Fedora 32 jobs will be replaced by 35, so update the os2node.yaml.inc properly. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

Added the contact to the Kata CI team on the QEMU and Kernel job templates. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

wainersm · 2022-01-06T13:05:58Z

Updated this PR to address the latest comments of @fidencio and @jodh-intel . I didn't change the experimental job, as agreed with @jongwu and @jodh-intel I will send a follow up when things are settle down.

fidencio

lgtm, thanks @wainersm!

wainersm · 2022-01-14T19:15:08Z

@fidencio @jodh-intel could you please merge this?

ps: Fabiano added me on this repository but for some obscure reasons I cannot merge nor do administrative tasks on it...

fidencio added no-backport-needed Changed do not need to be applied to an older branch / repository no-forward-port-needed Changed do not need to be applied to a newer branch / repository labels Nov 10, 2021

fidencio requested changes Nov 10, 2021

View reviewed changes

wainersm mentioned this pull request Nov 10, 2021

jobs-builder: plan of migration - your help is needed #407

Open

jodh-intel reviewed Dec 23, 2021

View reviewed changes

wainersm force-pushed the jjb branch from fbff54f to bbbb8a7 Compare December 29, 2021 12:57

wainersm added 7 commits December 29, 2021 10:13

jobs-builder: drop stable-2.2 jobs for QEMU

36c1bc0

Instead we should be building QEMU for stable-2.3 Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

jobs-builder: added more shell options to publish_jobs.sh

a389b44

Added errexit and friends to publish_jobs.sh Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

jobs-builder: change descriptions to HTML

84c9919

Our Jenkins is configured to render the job description as HTML, so this changed the description of all jobs properly. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

wainersm force-pushed the jjb branch 2 times, most recently from 2890478 to 7b19b72 Compare December 29, 2021 13:48

jobs-builder: fix spelling errors on README.md

aba1ff5

Make the spell checker happy. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

wainersm force-pushed the jjb branch from 7b19b72 to aba1ff5 Compare December 29, 2021 13:51

jodh-intel mentioned this pull request Jan 4, 2022

experimentally enable vcpu hotplug and virtio-mem on arm64 in kernel part kata-containers/kata-containers#3281

Merged

jodh-intel reviewed Jan 4, 2022

View reviewed changes

jodh-intel approved these changes Jan 4, 2022

View reviewed changes

jobs-builder/jobs/dependencies.yaml Outdated Show resolved Hide resolved

jongwu reviewed Jan 5, 2022

View reviewed changes

wainersm added 2 commits January 5, 2022 16:44

jobs-builder: Update Fedora os2node.yaml.inc

b8f0c20

The Fedora 32 jobs will be replaced by 35, so update the os2node.yaml.inc properly. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

jobs-builder: add generic contact on jobs templates

df63951

Added the contact to the Kata CI team on the QEMU and Kernel job templates. Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

fidencio approved these changes Jan 7, 2022

View reviewed changes

jodh-intel merged commit 2228a55 into kata-containers:main Jan 17, 2022

This was referenced Jan 21, 2022

CI: update URLs for the new qemu/kernel cache jobs kata-containers/tests#4396

Closed

jobs-builder: add PR jobs for Fedora 35 #419

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

main | Introduce Jenkins Job Builder for CI #406

main | Introduce Jenkins Job Builder for CI #406

wainersm commented Nov 10, 2021

wainersm commented Nov 10, 2021

fidencio left a comment

wainersm commented Nov 10, 2021

fidencio commented Nov 10, 2021 •

edited

Loading

jodh-intel left a comment

jodh-intel Dec 23, 2021

wainersm Dec 28, 2021

jodh-intel Dec 23, 2021

wainersm commented Dec 29, 2021

wainersm commented Dec 29, 2021

fidencio commented Jan 4, 2022

jodh-intel Jan 4, 2022

jodh-intel left a comment

jongwu Jan 5, 2022

wainersm Jan 5, 2022

jongwu Jan 6, 2022

jodh-intel Jan 6, 2022

wainersm Jan 6, 2022

wainersm commented Jan 6, 2022

fidencio left a comment

wainersm commented Jan 14, 2022

		export target_branch="$branch"
		{% if flavor == "experimental" -%}

main | Introduce Jenkins Job Builder for CI #406

main | Introduce Jenkins Job Builder for CI #406

Conversation

wainersm commented Nov 10, 2021

wainersm commented Nov 10, 2021

fidencio left a comment

Choose a reason for hiding this comment

wainersm commented Nov 10, 2021

fidencio commented Nov 10, 2021 • edited Loading

jodh-intel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wainersm commented Dec 29, 2021

wainersm commented Dec 29, 2021

fidencio commented Jan 4, 2022

Choose a reason for hiding this comment

jodh-intel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wainersm commented Jan 6, 2022

fidencio left a comment

Choose a reason for hiding this comment

wainersm commented Jan 14, 2022

fidencio commented Nov 10, 2021 •

edited

Loading