Merge "Create stable branch for Kuberef"

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index e732958..825fe10 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -100,6 +100,8 @@
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python3.6/\
           site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
+            -v /home/opnfv/functest/singlevm.py:/usr/lib/python3.6/\
+          site-packages/functest/core/singlevm.py \
             $image run_tests -t {test} -r -p
 
 - builder:
@@ -581,11 +583,15 @@
           projects:
             - name: 'airship-opnfv-functest-healthcheck-{tag}-rmi'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-rmi'
+              <<: *airship-jobs
       - multijob:
           name: pull containers
           projects:
             - name: 'airship-opnfv-functest-healthcheck-{tag}-pull'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-pull'
+              <<: *airship-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{functest_tag}
           projects:
@@ -603,6 +609,11 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-cinder_test-run'
               <<: *airship-jobs
+      - multijob:
+          name: opnfv/functest-smoke:{functest_tag}
+          projects:
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *airship-jobs
 
 - project:
     name: 'airship'

diff --git a/releases/jerma/airship.yaml b/releases/jerma/airship.yaml
new file mode 100644 (file)
index 0000000..147784c
--- /dev/null
+++ b/releases/jerma/airship.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2020 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: airship
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      airship: 53fcf67dbb9545fa939aa11386e26bfe3dda6cad