From fae9a98c543033e3df3b7dede87678594d7aca3d Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Mon, 5 Oct 2020 16:13:57 -0400
Subject: [PATCH 01/10] jobs-builder: Introduce Jenkins Job Builder for CI

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 a22049ce3d656b7f2574c98f4aa7b3b59511749a)
---
 .gitignore                                 |   4 +
 jobs-builder/README.md                     |  86 ++++++++++++
 jobs-builder/jjb.conf.template             |  20 +++
 jobs-builder/jobs/dependencies.yaml        | 146 +++++++++++++++++++++
 jobs-builder/jobs/include/os2node.yaml.inc |  21 +++
 jobs-builder/publish_jobs.sh               |  72 ++++++++++
 6 files changed, 349 insertions(+)
 create mode 100644 jobs-builder/README.md
 create mode 100644 jobs-builder/jjb.conf.template
 create mode 100644 jobs-builder/jobs/dependencies.yaml
 create mode 100644 jobs-builder/jobs/include/os2node.yaml.inc
 create mode 100755 jobs-builder/publish_jobs.sh

diff --git a/.gitignore b/.gitignore
index 04336a6a..5c7dbe5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,7 @@ jenkins/credentials.xml
 # Include the deployment files
 !deployment
 !deployment/**
+
+# Include the Jenkins Job Builder files
+!jobs-builder
+!jobs-builder/**
diff --git a/jobs-builder/README.md b/jobs-builder/README.md
new file mode 100644
index 00000000..68800aa9
--- /dev/null
+++ b/jobs-builder/README.md
@@ -0,0 +1,86 @@
+# Overview
+
+Manage the Jenkins jobs with help of the [Jenkins Job Builder](https://docs.openstack.org/infra/jenkins-job-builder) (JJB).
+
+The JJB converts jobs and views from YAML representations into the Jenkins XML
+configuration files. Also the tool is able to manage jobs, for example, publish
+the generated jobs and views in a running Jenkins instance.
+
+# Getting started
+
+First of all, you need to install Jenkins Job Builder in your environment. The
+instructions can be found [here](https://docs.openstack.org/infra/jenkins-job-builder/installation.html).
+
+To use the Jenkins Job Builder a configuration file is needed which contains
+the Jenkins URL, user and token API to manage Jenkins, among other information
+that sets the tool's behavior. That file can copied from the `jjb.conf.template`
+template then filling out the fields marked with *XXX*.
+
+Bootstrapping your environment:
+```bash
+$ pip install --user jenkins-job-builder
+$ cp jjb.conf.template jjb.conf
+$ sed -i 's/user=XXX/user=my_user/' jjb.conf
+$ sed -i 's/password=XXX/password=my_user_token/' jjb.conf
+```
+
+# Managing the jobs
+
+Use the `publish_jobs.sh` to update all the Jenkins Job Builder managed jobs.
+
+Example of use:
+```bash
+$ ./publish_jobs.sh -c jjb.conf
+```
+
+If you only want to check the jobs can be generated but not actually publish
+them all then do:
+```bash
+$ ./publish_jobs.sh -c jjb.conf -t
+```
+
+Run `./publish_jobs.sh -h` to see all the available options of the script.
+
+# Checking your changes on a local Jenkins
+
+Often you will need to see how the jobs look like on the Jenkins UI in order
+to check that the generated configurations are correct. The easiest way to
+accomplish that is to publish the jobs on a local Jenkins instance. Use the
+following instructions to setup a sandbox locally, but beware that it won't be
+exactly alike the instance on production, although for the purpose of checking
+the configurations it works out.
+
+ 1. Start the Jenkins container
+
+The following command creates the jenkins container, and the instance service
+will be accessible through the port 8080 on localhost.
+
+```bash
+$ docker run --rm -p 8080:8080 --name=jenkins-container -d jenkins/jenkins
+```
+
+ 2. Give an initial configuration
+
+Using your web browser, access Jenkins from http://localhost:8080.
+
+The first displayed page asks for the initial administrator password, which can
+be obtained with the following command:
+
+```bash
+$ docker exec jenkins-container cat /var/jenkins_home/secrets/initialAdminPassword
+```
+
+Paste that token on the "administrator password" field then continue with the
+setup. You will be asked to install plugins (select to install all) and finally
+to create an account.
+
+ 3. Create the API token
+
+Access your new user account (on the top-right menus) then go to "Configure".
+Click "Add new Token" then on the "Generate" button. Save the generated token.
+
+ 4. Create the JJB configuration file
+
+Now you need to create the jjb.conf as explained on [Getting started](#getting-started). Use
+the username and API token created on the previous steps, and don't forget to set
+the *url* property to `http://localhost:8080`.
diff --git a/jobs-builder/jjb.conf.template b/jobs-builder/jjb.conf.template
new file mode 100644
index 00000000..f445b307
--- /dev/null
+++ b/jobs-builder/jjb.conf.template
@@ -0,0 +1,20 @@
+# Copyright (c) 2020 Red Hat, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Jenkins Job Builder configuration file (template).
+#
+[job_builder]
+ignore_cache=True
+keep_descriptions=False
+include_path=.:scripts:~/git/
+recursive=False
+exclude=.*:manual:./development
+allow_duplicates=False
+update=all
+
+[jenkins]
+user=XXX
+password=XXX
+url=https://jenkins.katacontainers.io
+query_plugins_info=False
diff --git a/jobs-builder/jobs/dependencies.yaml b/jobs-builder/jobs/dependencies.yaml
new file mode 100644
index 00000000..45c96b62
--- /dev/null
+++ b/jobs-builder/jobs/dependencies.yaml
@@ -0,0 +1,146 @@
+# Copyright (c) 2021 Red Hat, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# This file contains the configurations to generate the Kernel and QEMU jobs.
+#
+---
+###
+# Define shareable YAML snippets.
+###
+- common_job_properties: &common_job_properties
+    name: 'common_job_properties'
+    project-type: freestyle
+    disabled: false
+    concurrent: true
+    logrotate:
+      daysToKeep: 30
+      numToKeep: 5
+    # Convert the os variable to label name.
+    node: !include-jinja2: include/os2node.yaml.inc
+    scm:
+      - git:
+          url: https://github.com/kata-containers/kata-containers
+          branches:
+            - '*/{branch}'
+    wrappers:
+      - ansicolor:
+          colormap: "xterm"
+      - openstack:
+          single-use: True
+      - timestamps
+      - timeout:
+          timeout: 20
+          type: no-activity
+- default_publishers: &default_publishers
+    name: 'default_publishers'
+    publishers:
+      - archive:
+          artifacts: "artifacts/*"
+###
+# Define jobs templates.
+###
+- job-template:
+    name: kata-containers-{branch}-kernel-{flavor}-{arch}
+    <<: *common_job_properties
+    maintainers:
+      - Wainer dos Santos Moschetta <wainersm@redhat.com>
+    description:
+      !j2: |
+        Build Kernel for usage in Kata Containers CI jobs.
+        You should not use these artifacts on production.
+
+        Maintainers:
+        {% for i in maintainers -%}
+        - {{ i }}
+        {% endfor %}
+    triggers:
+      - timed: 'H 0-23/6 * * 1-5'
+    builders:
+      - shell:
+          !j2: |
+            #!/bin/bash
+            set -e
+            set -x
+
+            export GOPATH="${WORKSPACE}/go"
+            export GOROOT="/usr/local/go"
+
+            sudo apt install -y golang
+            source ci/lib.sh
+            export branch="{{branch}}"
+            export target_branch="$branch"
+            {% if flavor == "experimental" -%}
+            export experimental_kernel=true
+            {% endif %}
+            clone_tests_repo
+            ci/install_go.sh
+            cd "$tests_repo_dir"
+            ./.ci/install_kata_kernel.sh
+            ./.ci/ci_cache_components.sh -k
+    <<: *default_publishers
+- job-template:
+    name: kata-containers-{branch}-qemu-{arch}
+    <<: *common_job_properties
+    maintainers:
+      - Wainer dos Santos Moschetta <wainersm@redhat.com>
+    description:
+      # Passing a Jinja2 template.
+      !j2: |
+        Build QEMU for usage in Kata Containers CI jobs.
+        You should not use these artifacts on production.
+
+        Maintainers:
+        {% for i in maintainers -%}
+        - {{ i }}
+        {% endfor %}
+    triggers:
+      - github
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -e
+          set -x
+
+          export GOPATH="$WORKSPACE/go"
+          export GOROOT="/usr/local/go"
+          export PATH="$PATH:$GOPATH/bin"
+
+          sudo apt install -y golang
+          source ci/lib.sh
+          export branch="{branch}"
+          export target_branch="$branch"
+          clone_tests_repo
+          ci/install_go.sh
+
+          cd "$tests_repo_dir"
+          ./.ci/setup_env_ubuntu.sh "default"
+          ./cmd/container-manager/manage_ctr_mgr.sh docker install -f
+          ./.ci/install_qemu.sh
+          ./.ci/ci_cache_components.sh -q
+    <<: *default_publishers
+###
+# Define the projects
+###
+- project:
+    name: "Create Kernel cache jobs"
+    flavor:
+      - vanilla
+      - experimental
+    branch:
+      - main
+    arch:
+      - x86_64
+    os: ubuntu1804
+    jobs:
+      - "kata-containers-{branch}-kernel-{flavor}-{arch}"
+- project:
+    name: "Create QEMU cache jobs"
+    branch:
+      - main
+      - stable-2.2
+    arch:
+      - x86_64
+    os: ubuntu1804
+    jobs:
+      - "kata-containers-{branch}-qemu-{arch}"
diff --git a/jobs-builder/jobs/include/os2node.yaml.inc b/jobs-builder/jobs/include/os2node.yaml.inc
new file mode 100644
index 00000000..3a21fbb3
--- /dev/null
+++ b/jobs-builder/jobs/include/os2node.yaml.inc
@@ -0,0 +1,21 @@
+{#
+# Copyright (c) 2020 Red Hat, Inc.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Convert OS name to node label string.
+#}
+{% if os == "centos8" -%}
+centos8_azure
+{% elif os == "debian10" -%}
+debian10_azure
+{% elif os == "fedora32" -%}
+fedora32_azure
+{% elif os == "opensuse15" -%}
+opensuse15-azure
+{% elif os == "rhel8" -%}
+rhel8_azure
+{% elif os == "ubuntu1804" -%}
+ubuntu1804_azure
+{% elif os == "ubuntu1804_ARM" -%}
+arm_node && arm-ubuntu-1804
+{% endif %}
diff --git a/jobs-builder/publish_jobs.sh b/jobs-builder/publish_jobs.sh
new file mode 100755
index 00000000..ad73e6f5
--- /dev/null
+++ b/jobs-builder/publish_jobs.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+#
+# Copyright (c) 2020 Red Hat, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Use this script to publish the jobs on Jenkins.
+#
+set -e
+
+script_dir="$(realpath $(dirname $0))"
+jobs_dir="$script_dir/jobs"
+readonly cmd="jenkins-jobs"
+test_only=0
+config_file=""
+
+function die
+{
+	local msg="$*"
+	echo "ERROR: $msg" >&2
+	exit 1
+}
+
+function usage
+{
+	cat <<-EOF
+	This script uses the Jenkins Job Builder to manage the Kata Containers
+	CI jobs on Jenkins.
+
+	It needs the jenkins-jobs command installed as well as a configuration
+	file that contains information about how to access the Jenkins
+	instance. See the README.md for further details.
+
+	Usage $0: -c CONFIG [-t] [-h], where:
+	  -c           Path to the configuration file.
+	  -h           Print this message.
+	  -t           Do not publish jobs, only test they can be generated.
+	EOF
+}
+
+function parse_args
+{
+	while getopts "c:ht" opt; do
+		case ${opt} in
+			c) config_file="${OPTARG}" ;;
+			h) usage; exit 0 ;;
+			t) test_only=1 ;;
+			*) usage; exit 1 ;;
+		esac
+	done
+
+	if [ -z "$config_file" ]; then
+		usage
+		die "missing the config file"
+	fi
+}
+
+function main
+{
+	parse_args "$@"
+	command -v "$cmd" || die "$cmd command is needed"
+
+	# First test it can generate the jobs.
+	$cmd test "$jobs_dir" || die "some jobs cannot be generated"
+
+	if [ $test_only -eq 0 ]; then
+		# Going to update the managed jobs.
+		$cmd --conf "$config_file" update "$jobs_dir"
+	fi
+}
+
+main "$@"

From 6dc5f5d1c90eecc5c5c2edab722cc0a98cfe863c Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Tue, 28 Dec 2021 11:31:49 -0300
Subject: [PATCH 02/10] jobs-builder: update the include/os2node.yaml.inc

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>
---
 jobs-builder/jobs/include/os2node.yaml.inc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/jobs-builder/jobs/include/os2node.yaml.inc b/jobs-builder/jobs/include/os2node.yaml.inc
index 3a21fbb3..d1c7242d 100644
--- a/jobs-builder/jobs/include/os2node.yaml.inc
+++ b/jobs-builder/jobs/include/os2node.yaml.inc
@@ -6,16 +6,12 @@
 #}
 {% if os == "centos8" -%}
 centos8_azure
-{% elif os == "debian10" -%}
-debian10_azure
 {% elif os == "fedora32" -%}
 fedora32_azure
-{% elif os == "opensuse15" -%}
-opensuse15-azure
-{% elif os == "rhel8" -%}
-rhel8_azure
 {% elif os == "ubuntu1804" -%}
-ubuntu1804_azure
-{% elif os == "ubuntu1804_ARM" -%}
-arm_node && arm-ubuntu-1804
+ubuntu1804_azure || ubuntu1804-azure
+{% elif os == "ubuntu-20.04" -%}
+ubuntu_20.04
+{% elif os == "ubuntu-20.04-ARM" -%}
+arm_node || arm-ubuntu-2004
 {% endif %}

From 36c1bc0e5f7713ace38488ca7222528ff43fa9c5 Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Tue, 28 Dec 2021 11:47:03 -0300
Subject: [PATCH 03/10] jobs-builder: drop stable-2.2 jobs for QEMU

Instead we should be building QEMU for stable-2.3

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
---
 jobs-builder/jobs/dependencies.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs-builder/jobs/dependencies.yaml b/jobs-builder/jobs/dependencies.yaml
index 45c96b62..6f2e6926 100644
--- a/jobs-builder/jobs/dependencies.yaml
+++ b/jobs-builder/jobs/dependencies.yaml
@@ -138,7 +138,7 @@
     name: "Create QEMU cache jobs"
     branch:
       - main
-      - stable-2.2
+      - stable-2.3
     arch:
       - x86_64
     os: ubuntu1804

From a389b447050d1af7bdfe8e4a4d40b3aa5514cf87 Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Tue, 28 Dec 2021 11:50:01 -0300
Subject: [PATCH 04/10] jobs-builder: added more shell options to
 publish_jobs.sh

Added errexit and friends to publish_jobs.sh

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
---
 jobs-builder/publish_jobs.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jobs-builder/publish_jobs.sh b/jobs-builder/publish_jobs.sh
index ad73e6f5..43ec76fc 100755
--- a/jobs-builder/publish_jobs.sh
+++ b/jobs-builder/publish_jobs.sh
@@ -6,7 +6,13 @@
 #
 # Use this script to publish the jobs on Jenkins.
 #
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
+
+[ -n "$BASH_VERSION" ] && set -o errtrace
+
+[ -n "${DEBUG:-}" ] && set -o xtrace
 
 script_dir="$(realpath $(dirname $0))"
 jobs_dir="$script_dir/jobs"

From 1c6c531b9285a683537ceb2125c974d52acf6541 Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Tue, 28 Dec 2021 15:17:09 -0300
Subject: [PATCH 05/10] jobs-builder: update QEMU and Kernel script templates

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>
---
 jobs-builder/jobs/dependencies.yaml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/jobs-builder/jobs/dependencies.yaml b/jobs-builder/jobs/dependencies.yaml
index 6f2e6926..22ab3714 100644
--- a/jobs-builder/jobs/dependencies.yaml
+++ b/jobs-builder/jobs/dependencies.yaml
@@ -60,18 +60,23 @@
       - shell:
           !j2: |
             #!/bin/bash
-            set -e
-            set -x
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+            [ -n "$BASH_VERSION" ] && set -o errtrace
+            {% raw %}
+            [ -n "${DEBUG:-}" ] && set -o xtrace
+            {% endraw %}
 
             export GOPATH="${WORKSPACE}/go"
             export GOROOT="/usr/local/go"
+            export PATH="$PATH:$GOPATH/bin:$GOROOT/bin"
 
-            sudo apt install -y golang
             source ci/lib.sh
             export branch="{{branch}}"
             export target_branch="$branch"
             {% if flavor == "experimental" -%}
-            export experimental_kernel=true
+            export build_type="experimental"
             {% endif %}
             clone_tests_repo
             ci/install_go.sh
@@ -99,14 +104,16 @@
     builders:
       - shell: |
           #!/bin/bash
-          set -e
-          set -x
+          set -o errexit
+          set -o nounset
+          set -o pipefail
+          [ -n "$BASH_VERSION" ] && set -o errtrace
+          [ -n "${{DEBUG:-}}" ] && set -o xtrace
 
           export GOPATH="$WORKSPACE/go"
           export GOROOT="/usr/local/go"
-          export PATH="$PATH:$GOPATH/bin"
+          export PATH="$PATH:$GOPATH/bin:$GOROOT/bin"
 
-          sudo apt install -y golang
           source ci/lib.sh
           export branch="{branch}"
           export target_branch="$branch"

From 84c9919882a86080eacba0851b73412f8f1c83b2 Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Wed, 29 Dec 2021 09:13:22 -0300
Subject: [PATCH 06/10] jobs-builder: change descriptions to HTML

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>
---
 jobs-builder/jobs/dependencies.yaml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/jobs-builder/jobs/dependencies.yaml b/jobs-builder/jobs/dependencies.yaml
index 22ab3714..be9b0af4 100644
--- a/jobs-builder/jobs/dependencies.yaml
+++ b/jobs-builder/jobs/dependencies.yaml
@@ -44,16 +44,18 @@
     name: kata-containers-{branch}-kernel-{flavor}-{arch}
     <<: *common_job_properties
     maintainers:
-      - Wainer dos Santos Moschetta <wainersm@redhat.com>
+      - Wainer dos Santos Moschetta &ltwainersm@redhat.com&gt
     description:
       !j2: |
-        Build Kernel for usage in Kata Containers CI jobs.
-        You should not use these artifacts on production.
+        <p>Build Kernel for usage in Kata Containers CI jobs.</p>
+        <p>You should not use these artifacts on production.</p>
 
         Maintainers:
+        <ul>
         {% for i in maintainers -%}
-        - {{ i }}
+        <li>{{ i }}</li>
         {% endfor %}
+        </ul>
     triggers:
       - timed: 'H 0-23/6 * * 1-5'
     builders:
@@ -88,17 +90,19 @@
     name: kata-containers-{branch}-qemu-{arch}
     <<: *common_job_properties
     maintainers:
-      - Wainer dos Santos Moschetta <wainersm@redhat.com>
+      - Wainer dos Santos Moschetta &ltwainersm@redhat.com&gt
     description:
       # Passing a Jinja2 template.
       !j2: |
-        Build QEMU for usage in Kata Containers CI jobs.
-        You should not use these artifacts on production.
+        <p>Build QEMU for usage in Kata Containers CI jobs.</p>
+        <p>You should not use these artifacts on production.</p>
 
         Maintainers:
+        <ul>
         {% for i in maintainers -%}
-        - {{ i }}
+        <li>{{ i }}</li>
         {% endfor %}
+        </ul>
     triggers:
       - github
     builders:

From 4572dca870b8b6e00e3edf49b9fb25559a8f77d3 Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Wed, 29 Dec 2021 09:16:11 -0300
Subject: [PATCH 07/10] jobs-builder: strip newlines in the output of
 os2node.yaml.inc

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>
---
 jobs-builder/jobs/include/os2node.yaml.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jobs-builder/jobs/include/os2node.yaml.inc b/jobs-builder/jobs/include/os2node.yaml.inc
index d1c7242d..92048ad0 100644
--- a/jobs-builder/jobs/include/os2node.yaml.inc
+++ b/jobs-builder/jobs/include/os2node.yaml.inc
@@ -4,14 +4,14 @@
 #
 # Convert OS name to node label string.
 #}
-{% if os == "centos8" -%}
+{%- if os == "centos8" -%}
 centos8_azure
-{% elif os == "fedora32" -%}
+{%- elif os == "fedora32" -%}
 fedora32_azure
-{% elif os == "ubuntu1804" -%}
+{%- elif os == "ubuntu1804" -%}
 ubuntu1804_azure || ubuntu1804-azure
-{% elif os == "ubuntu-20.04" -%}
+{%- elif os == "ubuntu-20.04" -%}
 ubuntu_20.04
-{% elif os == "ubuntu-20.04-ARM" -%}
+{%- elif os == "ubuntu-20.04-ARM" -%}
 arm_node || arm-ubuntu-2004
-{% endif %}
+{%- endif %}

From aba1ff5a125c4ea24de1e46deb8defd596c4f460 Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Wed, 29 Dec 2021 10:34:41 -0300
Subject: [PATCH 08/10] jobs-builder: fix spelling errors on README.md

Make the spell checker happy.

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
---
 README.md              |  4 ++++
 jobs-builder/README.md | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0029df7a..63112c3d 100644
--- a/README.md
+++ b/README.md
@@ -57,3 +57,7 @@ You can check for any known CI system issues [via this link](http://jenkins.kata
 The Jenkins CI jobs can be controlled (such as re-triggered or skipped) in a number of ways. Details of the
 control trigger phrases are listed on
 [a community repo wiki page](https://github.com/kata-containers/community/wiki/Controlling-the-CI).
+
+# Jobs builder
+
+See [README](jobs-builder/README.md) for information about the use of Jenkins Job Builder (JJB) to make the CI jobs.
diff --git a/jobs-builder/README.md b/jobs-builder/README.md
index 68800aa9..da6f7818 100644
--- a/jobs-builder/README.md
+++ b/jobs-builder/README.md
@@ -52,8 +52,8 @@ the configurations it works out.
 
  1. Start the Jenkins container
 
-The following command creates the jenkins container, and the instance service
-will be accessible through the port 8080 on localhost.
+The following command creates the Jenkins container, and the instance service
+will be accessible through the port 8080 on the local host.
 
 ```bash
 $ docker run --rm -p 8080:8080 --name=jenkins-container -d jenkins/jenkins
@@ -61,7 +61,7 @@ $ docker run --rm -p 8080:8080 --name=jenkins-container -d jenkins/jenkins
 
  2. Give an initial configuration
 
-Using your web browser, access Jenkins from http://localhost:8080.
+Using your web browser, access Jenkins from [http://localhost:8080](http://localhost:8080).
 
 The first displayed page asks for the initial administrator password, which can
 be obtained with the following command:
@@ -81,6 +81,6 @@ Click "Add new Token" then on the "Generate" button. Save the generated token.
 
  4. Create the JJB configuration file
 
-Now you need to create the jjb.conf as explained on [Getting started](#getting-started). Use
-the username and API token created on the previous steps, and don't forget to set
-the *url* property to `http://localhost:8080`.
+Now you need to create the `jjb.conf` as explained on [Getting started](#getting-started). Use
+the user name and API token created on the previous steps, and don't forget to set
+the `url` property to `http://localhost:8080`.

From b8f0c205541a306214b79314c096034d00df3341 Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Wed, 5 Jan 2022 16:44:43 -0300
Subject: [PATCH 09/10] jobs-builder: Update Fedora os2node.yaml.inc

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/jobs/include/os2node.yaml.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jobs-builder/jobs/include/os2node.yaml.inc b/jobs-builder/jobs/include/os2node.yaml.inc
index 92048ad0..5f267fa7 100644
--- a/jobs-builder/jobs/include/os2node.yaml.inc
+++ b/jobs-builder/jobs/include/os2node.yaml.inc
@@ -6,8 +6,8 @@
 #}
 {%- if os == "centos8" -%}
 centos8_azure
-{%- elif os == "fedora32" -%}
-fedora32_azure
+{%- elif os == "fedora35" -%}
+fedora35_azure
 {%- elif os == "ubuntu1804" -%}
 ubuntu1804_azure || ubuntu1804-azure
 {%- elif os == "ubuntu-20.04" -%}

From df639515d0a53f35ca9d709b3f340a22c2ffce87 Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Wed, 5 Jan 2022 16:53:34 -0300
Subject: [PATCH 10/10] jobs-builder: add generic contact on jobs templates

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>
---
 jobs-builder/jobs/dependencies.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jobs-builder/jobs/dependencies.yaml b/jobs-builder/jobs/dependencies.yaml
index be9b0af4..c6045234 100644
--- a/jobs-builder/jobs/dependencies.yaml
+++ b/jobs-builder/jobs/dependencies.yaml
@@ -44,7 +44,7 @@
     name: kata-containers-{branch}-kernel-{flavor}-{arch}
     <<: *common_job_properties
     maintainers:
-      - Wainer dos Santos Moschetta &ltwainersm@redhat.com&gt
+      - Kata Containers CI team (#kata-ci at Slack)
     description:
       !j2: |
         <p>Build Kernel for usage in Kata Containers CI jobs.</p>
@@ -90,7 +90,7 @@
     name: kata-containers-{branch}-qemu-{arch}
     <<: *common_job_properties
     maintainers:
-      - Wainer dos Santos Moschetta &ltwainersm@redhat.com&gt
+      - Kata Containers CI team (#kata-ci at Slack)
     description:
       # Passing a Jinja2 template.
       !j2: |