summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/airship/airship.yaml6
-rw-r--r--jjb/cirv/cirv-hdv-rtd-jobs.yaml22
-rw-r--r--jjb/cirv/cirv-rtd-jobs.yaml21
-rw-r--r--jjb/cirv/cirv-sdv-rtd-jobs.yaml22
-rw-r--r--jjb/functest/functest.ovn.yaml2
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yaml4
-rw-r--r--jjb/releng/opnfv-lint.yaml5
-rw-r--r--releases/jerma/airship.yaml7
8 files changed, 78 insertions, 11 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 2f152b8fe..8129ef0bf 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -379,7 +379,6 @@
- job-template:
name: 'airship-{tag}-daily'
- disabled: true
project-type: multijob
triggers:
- timed: '0 6 * * 3,6'
@@ -474,12 +473,8 @@
<<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
<<: *airship-jobs
- - name: 'airship-opnfv-functest-smoke-{tag}-refstack_compute-run'
- <<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-refstack_object-run'
<<: *airship-jobs
- - name: 'airship-opnfv-functest-smoke-{tag}-refstack_platform-run'
- <<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-tempest_full-run'
<<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run'
@@ -554,7 +549,6 @@
- job-template:
name: 'airship-{tag}-gate'
- disabled: true
project-type: multijob
triggers:
- airship-patchset-created:
diff --git a/jjb/cirv/cirv-hdv-rtd-jobs.yaml b/jjb/cirv/cirv-hdv-rtd-jobs.yaml
new file mode 100644
index 000000000..54c007730
--- /dev/null
+++ b/jjb/cirv/cirv-hdv-rtd-jobs.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+ name: cirv-hdv-rtd
+ project: cirv-hdv
+ project-name: cirv-hdv
+
+ project-pattern: 'cirv-hdv'
+ # yamllint disable-line rule:line-length
+ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-cirv-hdv/140801/'
+ rtd-token: 'f29ff450f15f5c01f89f238320aa33763256bc7c'
+
+ stream:
+ - master:
+ branch: '{stream}'
+ disabled: false
+ - jerma:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+
+ jobs:
+ - '{project-name}-rtd-jobs'
diff --git a/jjb/cirv/cirv-rtd-jobs.yaml b/jjb/cirv/cirv-rtd-jobs.yaml
new file mode 100644
index 000000000..2812d9e87
--- /dev/null
+++ b/jjb/cirv/cirv-rtd-jobs.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+ name: cirv-rtd
+ project: cirv
+ project-name: cirv
+
+ project-pattern: 'cirv'
+ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-cirv/140765/'
+ rtd-token: 'cec79ce42917b10adb33f0af8aaa9be33eee63d9'
+
+ stream:
+ - master:
+ branch: '{stream}'
+ disabled: false
+ - jerma:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+
+ jobs:
+ - '{project-name}-rtd-jobs'
diff --git a/jjb/cirv/cirv-sdv-rtd-jobs.yaml b/jjb/cirv/cirv-sdv-rtd-jobs.yaml
new file mode 100644
index 000000000..2a5cf96c0
--- /dev/null
+++ b/jjb/cirv/cirv-sdv-rtd-jobs.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+ name: cirv-sdv-rtd
+ project: cirv-sdv
+ project-name: cirv-sdv
+
+ project-pattern: 'cirv-sdv'
+ # yamllint disable-line rule:line-length
+ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-cirv-sdv/140800/'
+ rtd-token: '5ce62cc08e799ac377397d654b62bde0d1dec22d'
+
+ stream:
+ - master:
+ branch: '{stream}'
+ disabled: false
+ - jerma:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+
+ jobs:
+ - '{project-name}-rtd-jobs'
diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 52ba2389d..3bd858527 100644
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -494,7 +494,6 @@
- job-template:
name: 'functest-ovn-{tag}-daily'
- disabled: true
project-type: multijob
triggers:
- timed: '@daily'
@@ -810,7 +809,6 @@
- job-template:
name: 'functest-ovn-{tag}-check'
- disabled: true
project-type: multijob
parameters:
- functest-ovn-slave:
diff --git a/jjb/opnfvdocs/opnfvdocs.yaml b/jjb/opnfvdocs/opnfvdocs.yaml
index fe5d14996..22d67d637 100644
--- a/jjb/opnfvdocs/opnfvdocs.yaml
+++ b/jjb/opnfvdocs/opnfvdocs.yaml
@@ -39,7 +39,7 @@
name: GIT_CLONE_BASE
default: ssh://gerrit.opnfv.org:29418
description: "Used for overriding the GIT URL coming from parameters macro."
- - 'opnfv-build-centos-defaults'
+ - 'opnfv-build-defaults'
scm:
- git-scm-gerrit
@@ -90,7 +90,7 @@
default: '$GS_BASE{gs-pathname}'
description: "Directory where the build artifact will be located upon\
\ the completion of the build."
- - 'opnfv-build-centos-defaults'
+ - 'opnfv-build-defaults'
scm:
- git-scm
diff --git a/jjb/releng/opnfv-lint.yaml b/jjb/releng/opnfv-lint.yaml
index 6483e3262..dcd262aa5 100644
--- a/jjb/releng/opnfv-lint.yaml
+++ b/jjb/releng/opnfv-lint.yaml
@@ -47,6 +47,7 @@
description: Slaves to execute yamllint
default-slaves:
- lf-build1
+ - lf-build2
allowed-multiselect: true
ignore-offline-nodes: true
@@ -96,9 +97,10 @@
branch: '{branch}'
- node:
name: SLAVE_NAME
- description: Slaves to execute yamllint
+ description: Slaves to execute pylint
default-slaves:
- lf-build1
+ - lf-build2
allowed-multiselect: true
ignore-offline-nodes: true
@@ -149,6 +151,7 @@
description: Slaves to execute yamllint
default-slaves:
- lf-build1
+ - lf-build2
allowed-multiselect: true
ignore-offline-nodes: true
diff --git a/releases/jerma/airship.yaml b/releases/jerma/airship.yaml
index 9b15fe598..22bb2fdca 100644
--- a/releases/jerma/airship.yaml
+++ b/releases/jerma/airship.yaml
@@ -11,7 +11,14 @@ project: airship
project-type: installer
release-model: stable
+releases:
+ - version: opnfv-10.0.0
+ location:
+ airship: a9ef2c8eb110daa3a395f7cb118bc5d26c5fca69
+
branches:
- name: stable/jerma
location:
airship: 4b2c638c2495be08953c1687ddbe689927d6cd8f
+
+release-notes: http://docs.opnfv.org/en/stable-jerma/submodules/airship/docs/release/release-notes/release-notes.html