Merge "Combine integration and airship-deckhand-ubuntu jobs together"

.zuul.yaml

@@ -17,11 +17,11 @@
       jobs:
         - airship-deckhand-tox-py27-postgresql
         - airship-deckhand-tox-py35-postgresql
-        - airship-deckhand-ubuntu:
+        - airship-deckhand-functional-uwsgi-py35:
             voting: false
-        - airship-deckhand-functional-uwsgi-py35
         - airship-deckhand-functional-docker-py35
-        - airship-deckhand-integration-uwsgi-py35
+        - airship-deckhand-integration-uwsgi-py35:
+            voting: false
         - airship-deckhand-integration-docker-py35
         - airship-deckhand-docker-build-gate
     gate:
@@ -58,35 +58,6 @@
     vars:
       tox_envlist: py35-postgresql
 
-- job:
-    name: airship-deckhand-base
-    roles:
-      - zuul: openstack/openstack-helm-infra
-    vars:
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
-    timeout: 3600
-    pre-run:
-      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
-      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
-      - tools/gate/playbooks/osh-infra-build.yaml
-      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
-    run: tools/gate/playbooks/airship-deckhand-check.yaml
-    post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
-    required-projects:
-      - openstack/openstack-helm-infra
-
-- job:
-    name: airship-deckhand-ubuntu
-    parent: airship-deckhand-base
-    nodeset: openstack-helm-single-node
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^releasenotes/.*$
-      - ^setup.cfg$
-      - ^deckhand/tests/unit/.*$
-
 - job:
     name: airship-deckhand-functional-uwsgi-py35
     description: |

tools/gate/playbooks/run-integration-tests-docker.yaml

@@ -16,6 +16,7 @@
   roles:
     - build-images
     - deploy-keystone-dependencies
+    - build-charts
     - deploy-barbican
     # NOTE: deploy-postgresql and deploy-deckhand must follow
     # deploy-keystone-dependencies which restarts Docker, causing
@@ -27,6 +28,7 @@
   tags:
     - build-images
     - deploy-keystone-dependencies
+    - build-charts
     - deploy-barbican
     - deploy-postgresql
     - generate-test-config

tools/gate/roles/build-charts/tasks/build-charts.yaml

@@ -1,4 +1,4 @@
-# Copyright 2017 The Openstack-Helm Authors.
+# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- hosts: primary
-  tasks:
-    - name: Build Charts
-      shell: |
-        set -xe;
-        ./tools/gate/scripts/010-build-charts.sh
-      args:
-        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
+- name: Build Helm Charts
+  when: disable_keystone == false
+  shell: |
+    set -xe;
+    ./tools/gate/scripts/010-build-charts.sh
+  args:
+    chdir: "{{ zuul.project.src_dir }}"

tools/gate/roles/build-charts/tasks/main.yaml

@@ -0,0 +1,15 @@
+# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- include: build-charts.yaml