Merge "Update airship jjbs"

diff --git a/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml
deleted file mode 100644 (file)
index 034d6d6..0000000
--- a/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- project:
-    name: 'ovn4nfv-daily-jobs'
-
-    project: 'ovn4nfv'
-
-    master: &master
-      stream: master
-      branch: '{stream}'
-      gs-pathname: ''
-      disabled: true
-
-    pod:
-      - virtual:
-          slave-label: 'joid-virtual'
-          os-version: 'xenial'
-          <<: *master
-
-    jobs:
-      - 'ovn4nfv-{pod}-daily-{stream}'
-
-- job-template:
-    name: 'ovn4nfv-{pod}-daily-{stream}'
-
-    project-type: multijob
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 1
-          max-per-node: 1
-          option: 'project'
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - ssh-agent-wrapper
-
-      - timeout:
-          timeout: 240
-          fail: true
-
-    triggers:
-      - timed: '@daily'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: os-ovn-nofeature-noha
-      - '{slave-label}-defaults'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: deploy
-          condition: SUCCESSFUL
-          projects:
-            - name: 'joid-deploy-{pod}-daily-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=os-ovn-nofeature-noha
-                COMPASS_OS_VERSION=xenial
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: functest
-          condition: SUCCESSFUL
-          projects:
-            - name: 'functest-joid-{pod}-daily-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=os-ovn-nofeature-ha
-                FUNCTEST_MODE=testcase
-                FUNCTEST_SUITE_NAME=ovn4nfv_test_suite
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true

diff --git a/jjb/ovn4nfv/ovn4nfv-project-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-project-jobs.yaml
deleted file mode 100644 (file)
index 8fbd75b..0000000
--- a/jjb/ovn4nfv/ovn4nfv-project-jobs.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- project:
-    name: ovn4nfv
-
-    project: '{name}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - gambia: &gambia
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - fraser:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-
-    jobs:
-      - 'ovn4nfv-build-{stream}'
-
-- job-template:
-    name: 'ovn4nfv-build-{stream}'
-
-    concurrent: true
-
-    disabled: '{obj:disabled}'
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 1
-          max-per-node: 1
-          option: 'project'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - opnfv-build-defaults
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: 'H 23 * * *'
-
-    builders:
-      - 'ovn4nfv-build-macro'
-
-- builder:
-    name: 'ovn4nfv-build-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "hello world"

diff --git a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml
deleted file mode 100644 (file)
index 984ec4f..0000000
--- a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- project:
-    name: ovn4nfv-rtd
-    project: ovn4nfv
-    project-name: ovn4nfv
-
-    project-pattern: 'ovn4nfv'
-    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ovn4nfv/47381/'
-    rtd-token: 'f131200fd878a5c443f18c134c3bfda122538bce'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          disabled: false
-
-    jobs:
-      - '{project-name}-rtd-jobs'

diff --git a/jjb/releng/releng-rtd-jobs.yaml b/jjb/releng/releng-jobs.yaml
similarity index 89%
rename from jjb/releng/releng-rtd-jobs.yaml
rename to jjb/releng/releng-jobs.yaml
index f7c9603..4a39333 100644 (file)
--- a/jjb/releng/releng-rtd-jobs.yaml
+++ b/jjb/releng/releng-jobs.yaml
@@ -4,6 +4,7 @@
     project: 'releng'
     project-name: 'releng'
     jjb-version: '2.5.0'
+    jjb-cache: "$WORKSPACE/.cache/jenkins_jobs"
 
     build-timeout: 60
 

diff --git a/releases/jerma/opnfvdocs.yaml b/releases/jerma/opnfvdocs.yaml
new file mode 100644 (file)
index 0000000..665be34
--- /dev/null
+++ b/releases/jerma/opnfvdocs.yaml
@@ -0,0 +1,9 @@
+---
+project: opnfvdocs
+project-type: infra
+release-model: stable
+
+branches:
+  - name: stable/jerma
+    location:
+      opnfvdocs: 1d0a0c19a3ca2d8d161a37232e7bf2366223bd49