Merge "Fix: Fix machine name"
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 20735ae..3dbe82d 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -19,6 +19,8 @@
node: '{build-node}'
type: freestyle
concurrent: true
+ disable-job: false
+ disabled: '{disable-job}'
pattern: '**'
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 8804725..428535a 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -12,6 +12,7 @@
script:
!include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
- '{project-name}-{stream}-{area}-verify-shell':
+ disable-job: '{disable-kud}'
area: kud-deployment
build-timeout: 45
script:
@@ -28,7 +29,10 @@
branch: 'master'
- 'honolulu':
branch: 'honolulu'
+ #KUD fixes are not backported to maintenance branches
+ disable-kud: true
mvn-settings: 'multicloud-k8s-settings'
+ disable-kud: false
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-builder-4c-4g