From f7bdddeeb790b42e37846288bd22e4515eebb6e5 Mon Sep 17 00:00:00 2001
From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 19 Apr 2023 08:40:10 +1000
Subject: [PATCH] Refactor!: JJB code to comply with updates to v5.x

Update global-jjb v0.86.0, this updates the minimal
version of JJB to v5.0.2.

Change-Id: I73f710ee47720aa97d274577c1a86bf526a5651c
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---
 global-jjb                                           | 2 +-
 jjb/akraino-templates/akraino-icn-templates.yaml     | 2 +-
 jjb/akraino-templates/akraino-jjb-kni.yaml           | 6 +++---
 jjb/akraino-templates/akraino-jjb-templates.yaml     | 3 ++-
 jjb/akraino-templates/akraino-validation-macros.yaml | 2 +-
 jjb/ci-management/static-slaves-ci-jobs.yaml         | 3 ++-
 jjb/iec/iec.yaml                                     | 2 +-
 jjb/rec/rec.yaml                                     | 2 +-
 jjb/validation/bluval.yaml                           | 2 +-
 jjb/validation/lab.yaml                              | 2 +-
 10 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/global-jjb b/global-jjb
index 02860f8..de13320 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 02860f86d24223854948d1d13a91a77496e7bd0f
+Subproject commit de13320dea5c46324937b12f69435e082e4edf0b
diff --git a/jjb/akraino-templates/akraino-icn-templates.yaml b/jjb/akraino-templates/akraino-icn-templates.yaml
index 9b2953c..9a185b3 100644
--- a/jjb/akraino-templates/akraino-icn-templates.yaml
+++ b/jjb/akraino-templates/akraino-icn-templates.yaml
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-- daaas_job_boiler_plate: &daaas_job_boiler_plate
+- _daaas_job_boiler_plate: &daaas_job_boiler_plate
     name: daaas_job_boiler_plate
     archive-artifacts: >
       **/*.log
diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index 7edb45c..a9fc7d9 100644
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -36,14 +36,14 @@
       - description-setter:
           regexp: "(^(Nexus|S3) build logs: .*)"
 
-- kni_common: &kni_common
+- _kni_common: &kni_common
     name: kni-common
 
     ######################
     # Default parameters #
     ######################
 
-    build-node: "{build-node}"
+    build-node: ""
     build-days-to-keep: 30
     build-timeout: 60
     submodule-recursive: true
@@ -105,7 +105,7 @@
     publishers:
       - lf-infra-publish
 
-- kni_common_deploy: &kni_common_deploy
+- _kni_common_deploy: &kni_common_deploy
     name: kni-common-deploy
     <<: *kni_common
     archive-artifacts: >
diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml
index ed7e8f0..b320852 100644
--- a/jjb/akraino-templates/akraino-jjb-templates.yaml
+++ b/jjb/akraino-templates/akraino-jjb-templates.yaml
@@ -348,7 +348,8 @@
 - job-template:
     id: akraino-project-build-node-init
     name: '{project-name}-{build-node}-init'
-    disabled: '{obj:disabled}'
+    # disable_job: false
+    disabled: '{obj:disable_job}'
     concurrent: true
 
     parameters:
diff --git a/jjb/akraino-templates/akraino-validation-macros.yaml b/jjb/akraino-templates/akraino-validation-macros.yaml
index 193657f..68ad5c5 100644
--- a/jjb/akraino-templates/akraino-validation-macros.yaml
+++ b/jjb/akraino-templates/akraino-validation-macros.yaml
@@ -59,7 +59,7 @@
 # SETTINGS #
 ############
 # settings for jobs run in multijob phases
-- docker-build-job-settings: &docker-build-job-settings
+- _docker-build-job-settings: &docker-build-job-settings
     name: docker_build_job_settings
     current-parameters: true
     git-revision: false
diff --git a/jjb/ci-management/static-slaves-ci-jobs.yaml b/jjb/ci-management/static-slaves-ci-jobs.yaml
index bb36b03..528d260 100644
--- a/jjb/ci-management/static-slaves-ci-jobs.yaml
+++ b/jjb/ci-management/static-slaves-ci-jobs.yaml
@@ -14,4 +14,5 @@
       - aarch64_baremetal_dev
 
     jobs:
-      - akraino-project-build-node-init
+      - akraino-project-build-node-init:
+          disable_job: false
diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index 78b1c2d..261dfd2 100644
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -12,7 +12,7 @@
     # -------------------------------
     stream:
       - master:
-          branch: '{stream}'
+          branch: 'master'
           gs-pathname: ''
           disabled: false
 
diff --git a/jjb/rec/rec.yaml b/jjb/rec/rec.yaml
index c41d57f..8a80b3b 100644
--- a/jjb/rec/rec.yaml
+++ b/jjb/rec/rec.yaml
@@ -10,7 +10,7 @@
     # -------------------------------
     stream:
       - master:
-          branch: '{stream}'
+          branch: master
           disabled: false
 
     # -------------------------------
diff --git a/jjb/validation/bluval.yaml b/jjb/validation/bluval.yaml
index df9897f..e01b3bc 100644
--- a/jjb/validation/bluval.yaml
+++ b/jjb/validation/bluval.yaml
@@ -19,7 +19,7 @@
     name: bluval
     project-name: validation
     project: validation
-    build-node: '{build-node}'
+    build-node: centos7-builder-2c-1g
     group-id: org.akraino.validation
     refspec: refs/heads/master
     branch: master
diff --git a/jjb/validation/lab.yaml b/jjb/validation/lab.yaml
index c31838b..c8e3d98 100644
--- a/jjb/validation/lab.yaml
+++ b/jjb/validation/lab.yaml
@@ -19,7 +19,7 @@
     name: lab
     project-name: validation
     project: validation
-    build-node: '{build-node}'
+    build-node: centos7-builder-2c-1g
     stream:
       - master:
           branch: '{stream}'
-- 
2.16.6