summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/airship/airship.yaml2
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yaml4
-rw-r--r--jjb/releng/opnfv-lint.yaml5
-rw-r--r--releases/jerma/airship.yaml7
4 files changed, 13 insertions, 5 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 823f1dbfa..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'
@@ -550,7 +549,6 @@
- job-template:
name: 'airship-{tag}-gate'
- disabled: true
project-type: multijob
triggers:
- airship-patchset-created:
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