summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Bańka <k.banka@samsung.com>2019-09-09 17:02:25 +0200
committerKonrad Bańka <k.banka@samsung.com>2019-09-09 17:10:17 +0200
commit67a1ef148ac34545731f369c1084251b9ffdec31 (patch)
treefbd755aa9a96238682f451fc3c20ce5a962ebd74
parent764bb8283a5cbf93ca9cbb8e2dd9760e783f9a78 (diff)
Switch KUD deploying job to run on changeset basis
Removed no longer used c template and created new one in script templates that suits it better. Issue-ID: MULTICLOUD-707 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: Iba5111a49d99dbe58bcb9af5a32c3adb7ee03176
-rw-r--r--jjb/global-templates-c.yaml32
-rw-r--r--jjb/global-templates-script.yaml46
-rw-r--r--jjb/multicloud/multicloud-k8s-kud-deployment.yaml15
-rw-r--r--jjb/multicloud/multicloud-k8s.yaml5
4 files changed, 51 insertions, 47 deletions
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index 38a06ce34..0df129366 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -101,35 +101,3 @@
settings-file: '{mvn-settings}'
- docker-login
- shell: '{script}'
-
-- job-template:
- #
- # job template for build project executed every 6hrs
- #
- # Required Variables:
- # script: build script to execute
- name: '{name}-{stream}-shell-6hrs'
- node: '{build-node}'
- type: freestyle
-
- parameters:
- - lf-infra-parameters:
- branch: '{branch}'
- project: '{project}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
-
- scm:
- - gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
- submodule-recursive: '{submodule-recursive}'
- choosing-strategy: 'gerrit'
-
- triggers:
- - timed: '00 */6 * * *'
-
- builders:
- - shell: '{script}'
-
- publishers:
- - lf-infra-publish
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index fcbf745fc..e6f074407 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -2,6 +2,52 @@
# vim: sw=2 ts=2 sts=2 et :
- job-template:
+ #
+ # job template for verifying gerrit changeset by shell script
+ #
+ # Required Variables:
+ # project-name: name of project
+ # area: area of project covered with this verification job
+ # project: name of scm repository to work on
+ # stream: name of stream used (set the same as branch if you're not sure)
+ # branch: git branch to work on
+ # script: build script to execute
+ # Optional Variables:
+ # pattern: trigger job only if modification covered file in pattern
+ # build-node: label(flavor) of jenkins slave
+ name: '{project-name}-{stream}-{area}-verify-shell'
+ node: '{build-node}'
+ type: freestyle
+
+ pattern: '**'
+
+ parameters:
+ - lf-infra-parameters:
+ branch: '{branch}'
+ project: '{project}'
+ stream: '{stream}'
+ lftools-version: '{lftools-version}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ submodule-recursive: '{submodule-recursive}'
+ choosing-strategy: 'gerrit'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '{pattern}'
+
+ builders:
+ - shell: '{script}'
+
+ publishers:
+ - lf-infra-publish
+
+- job-template:
# Job template for merging a submission. triggered on
# gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then
# run script
diff --git a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml b/jjb/multicloud/multicloud-k8s-kud-deployment.yaml
deleted file mode 100644
index d5334647d..000000000
--- a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- project:
- name: multicloud-k8s-kud-deployment
- project: 'multicloud/k8s'
- build-node: ubuntu1604-builder-4c-4g
- kud_build_script: !include-raw-escape: kud-deployment.sh
-
- stream:
- - 'master':
- branch: 'master'
-
- jobs:
- - '{name}-{stream}-shell-6hrs':
- script: '{kud_build_script}'
-
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 4d368afbc..914c2bdac 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -11,6 +11,11 @@
- '{project-name}-{stream}-docker-golang-shell-daily':
script:
!include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
+ - '{project-name}-{stream}-{area}-verify-shell':
+ area: kud-deployment
+ script:
+ !include-raw-escape: 'kud-deployment.sh'
+ build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/k8s'
subproject:
- validation-scripts: