From: Anil Belur <abelur@linuxfoundation.org>
Date: Tue, 11 Feb 2020 12:27:29 +0000 (+1000)
Subject: Update the branch script to set the java-version to openjdk11
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=eee7dfbc83a15b9f2226a871eee3de3e6e48b8c8

Update the branch script to set the java-version to openjdk11

Change-Id: Ib1b06fb03e8244cae5c7d17c59b31b0ebf94601d
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/scripts/branch_cut/branch_cut.awk b/scripts/branch_cut/branch_cut.awk
index e4553a9ac..a31766292 100755
--- a/scripts/branch_cut/branch_cut.awk
+++ b/scripts/branch_cut/branch_cut.awk
@@ -33,7 +33,8 @@ BEGIN {
     # replace block to add new release
     new_rel_yaml_tag            = "- " new_release ":";
     br_master_yaml_tag          = "    branch: 'master'";
-    jre_yaml_tag                = "    jre: 'openjdk8'";
+    jre_yaml_tag                = "    jre: 'openjdk11'";
+    java_version_yaml_tag       = "    java-version: 'openjdk11'";
     curr_rel_yaml_tag           = "- " curr_release ":";
     br_stable_curr_yaml_tag     = "    branch: 'stable/" curr_release "'";
 
@@ -166,6 +167,7 @@ function process_blk(bs, be, bn,   i, l) {
                 if (stream_found && release_found && !nrt_found) {
                     newblk[++nex3] = indent new_rel_yaml_tag;
                     newblk[++nex3] = indent br_master_yaml_tag;
+                    newblk[++nex3] = indent java_version_yaml_tag;
                     newblk[++nex3] = indent curr_rel_yaml_tag;
                     newblk[++nex3] = indent br_stable_curr_yaml_tag;
                     stream_found = 0;