From 064241b3382bbf1b5b4591c898718d6c6db7d4b1 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Wed, 19 Jun 2019 13:55:24 -0700 Subject: [PATCH] Update global-jjb to v0.39.1 This includes changes required for compatibility, in the form of adding "submodule-disable" definition to all instances of lf-infra-gerrit-scm calls. Change-Id: I27bc9c927166f1ffb36f27ff5dfa9882052e01f9 Signed-off-by: Eric Ball --- global-jjb | 2 +- jjb/akraino-templates/akraino-jjb-docker.yaml | 2 ++ jjb/akraino-templates/akraino-jjb-kni.yaml | 7 +++++++ jjb/akraino-templates/akraino-jjb-templates.yaml | 4 ++++ jjb/validation/validation-docker.yaml | 3 +++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/global-jjb b/global-jjb index 4ada8fb..a70124e 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 4ada8fbad994cdcb78c547742f4fe97456949193 +Subproject commit a70124ef46b23063d25ec178e627ac226b8cef8f diff --git a/jjb/akraino-templates/akraino-jjb-docker.yaml b/jjb/akraino-templates/akraino-jjb-docker.yaml index 62e2dc5..340659a 100644 --- a/jjb/akraino-templates/akraino-jjb-docker.yaml +++ b/jjb/akraino-templates/akraino-jjb-docker.yaml @@ -35,6 +35,7 @@ branch: '{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default builders: @@ -77,6 +78,7 @@ branch: '{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default builders: diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index 207e2cf..9edddb9 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -62,6 +62,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default gerrit_verify_triggers: @@ -154,6 +155,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default triggers: @@ -241,6 +243,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default triggers: @@ -338,6 +341,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default triggers: @@ -420,6 +424,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default gerrit_verify_triggers: @@ -515,6 +520,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default gerrit_verify_triggers: @@ -607,6 +613,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default triggers: diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml index 7090b31..55d9c69 100644 --- a/jjb/akraino-templates/akraino-jjb-templates.yaml +++ b/jjb/akraino-templates/akraino-jjb-templates.yaml @@ -97,6 +97,7 @@ branch: '{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default triggers: @@ -225,6 +226,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default triggers: @@ -256,6 +258,7 @@ - lf-sigul-sign-dir: sign-artifacts: '{sign-artifacts}' sign-dir: '$WORKSPACE/m2repo' + sign-mode: serial - lf-maven-stage - lf-provide-maven-settings-cleanup @@ -303,6 +306,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: 'gerrit' triggers: diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml index ae3d0d4..0325951 100644 --- a/jjb/validation/validation-docker.yaml +++ b/jjb/validation/validation-docker.yaml @@ -62,6 +62,7 @@ branch: '{branch}' submodule-recursive: false submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default triggers: @@ -116,6 +117,7 @@ branch: '{branch}' submodule-recursive: false submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default builders: @@ -147,6 +149,7 @@ branch: '{branch}' submodule-recursive: false submodule-timeout: '{submodule-timeout}' + submodule-disable: false choosing-strategy: default builders: -- 2.16.6