Update versions and branches used for koi

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: Iffde2d643c36250b074516d860f4dff5a3745044

diff --git a/jjb/release-jjb-koi-release/release-jjb-release.yaml b/jjb/release-jjb-koi-release/release-jjb-release.yaml
index 29ab879..c21a36b 100644 (file)
--- a/jjb/release-jjb-koi-release/release-jjb-release.yaml
+++ b/jjb/release-jjb-koi-release/release-jjb-release.yaml
@@ -13,7 +13,7 @@
     parameters:
       - string:
           name: GERRIT_BRANCH
-          default: master
+          default: koi
           description: "branch to build"
       - string:
           name: RELEASE_BRANCH
@@ -21,7 +21,7 @@
           description: "release branch to build"
       - string:
           name: RELEASE_VERSION
-          default: 10.91.0
+          default: 11.0.0
           description: "release version number for build"
       - string:
           name: UPLOAD
@@ -46,4 +46,3 @@
         - project: "release-jjb-koi-sources"
           current-parameters: true
           block: true
-          same-node: true

diff --git a/jjb/release-jjb-koi-snapshot/release-jjb-koi-snapshot.yaml b/jjb/release-jjb-koi-snapshot/release-jjb-koi-snapshot.yaml
index fc09b4f..2c3d75a 100644 (file)
--- a/jjb/release-jjb-koi-snapshot/release-jjb-koi-snapshot.yaml
+++ b/jjb/release-jjb-koi-snapshot/release-jjb-koi-snapshot.yaml
@@ -124,9 +124,3 @@
           - ../common/include-agl-lava-labs-prepare.sh
           - ../common/include-agl-run-test-short-koi.sh
           - ../common/include-agl-lava-jobs-submit-only.sh
-      - conditional-step:
-          condition-kind: always
-          steps:
-              - shell:
-                  !include-raw-escape:
-                  - ../common/include-agl-get-cost.sh

diff --git a/jjb/release-jjb-koi-sources/release-jjb-sources.yaml b/jjb/release-jjb-koi-sources/release-jjb-sources.yaml
index e02673b..7c1de30 100644 (file)
--- a/jjb/release-jjb-koi-sources/release-jjb-sources.yaml
+++ b/jjb/release-jjb-koi-sources/release-jjb-sources.yaml
@@ -13,11 +13,11 @@
     parameters:
       - string:
           name: GERRIT_BRANCH
-          default: master
+          default: koi
           description: "release version number for build"
       - string:
           name: RELEASE_VERSION
-          default: 10.91.0
+          default: 11.0.0
           description: "release version number for build"
       - string:
           name: RELEASE_BRANCH