[FIX] Fix ranger-agent test pod

1)Update ranger-agent SHA to support bionic Images. 2)Added heat deploy script for ranger deployment. 3)Created seperate Jobs for ranger and mini-mirror apparmor. Change-Id: Icecae5bd8f751508ef0417c8cc1a5e3959d44119 Signed-off-by: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>
2020-06-12 17:09:27 +00:00 · 2020-06-12 17:09:27 +00:00 · 7b762a8e23
parent 768722b1cf
commit 7b762a8e23
5 changed files with 93 additions and 35 deletions
--- a/ranger-agent/values.yaml
+++ b/ranger-agent/values.yaml
@ -18,16 +18,16 @@
 ---
 images:
  tags:
-    db_drop: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    db_init: docker.io/openstackhelm/heat:newton-ubuntu_xenial
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
    dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
    image_repo_sync: docker.io/docker:17.07.0
-    ks_endpoints: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    ks_service: docker.io/openstackhelm/heat:newton-ubuntu_xenial
-    ks_user: docker.io/openstackhelm/heat:newton-ubuntu_xenial
+    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
    rabbit_init: docker.io/rabbitmq:3.7-management
-    ranger-agent_db_sync: quay.io/attcomdev/ranger-agent:13c19fd49dda0509f1804664e46610f77e61344b
-    ranger_agent: quay.io/attcomdev/ranger-agent:13c19fd49dda0509f1804664e46610f77e61344b
+    ranger-agent_db_sync: quay.io/attcomdev/ranger-agent:cbfd19b550b722a605f799523e51c108a8f1311a
+    ranger_agent: quay.io/attcomdev/ranger-agent:cbfd19b550b722a605f799523e51c108a8f1311a
    scripted_test: docker.io/openstackhelm/heat:newton-ubuntu_xenial
  pull_policy: "IfNotPresent"
  local_registry:
@ -593,7 +593,7 @@ conf:
    ssh_key: null
    ssh_config: null
  test:
-    expected_end_status_key: Success
+    expected_end_status_key: "ORD_000"
  region:
    parameters: |-
      { "rangerAgentVersion": "2.0",
--- a/tools/deployment/component/heat/heat.sh
+++ b/tools/deployment/component/heat/heat.sh
@ -0,0 +1,38 @@
+#!/bin/bash
+
+# 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.
+
+set -xe
+
+# NOTE: Get the overrides to use
+export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_PATH:="../openstack-helm"}"}"
+: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(./tools/deployment/common/get-values-overrides.sh heat)"}
+
+#NOTE: Lint and package chart
+make -C ${HELM_CHART_ROOT_PATH} heat
+
+#NOTE: Deploy command
+: ${OSH_EXTRA_HELM_ARGS:=""}
+helm upgrade --install heat ${HELM_CHART_ROOT_PATH}/heat \
+    --namespace=openstack \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_HEAT}
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+helm status heat
+export OS_CLOUD=openstack_helm
+sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
+openstack orchestration service list
--- a/tools/deployment/component/ranger/ranger-agent.sh
+++ b/tools/deployment/component/ranger/ranger-agent.sh
@ -98,3 +98,6 @@ helm upgrade --install ranger-agent ./ranger-agent \

 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
+
+helm status ranger-agent
+helm test ranger-agent --timeout 900
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@ -64,10 +64,9 @@
    run: tools/gate/playbooks/osh-gate-runner.yaml
    vars:
      osh_params:
-        openstack_release: ocata
+        openstack_release: stein
        container_distro_name: ubuntu
        container_distro_version: bionic
-        feature_gates: apparmor
      gate_scripts:
        - ./tools/deployment/common/install-packages.sh
        - ./tools/deployment/common/deploy-k8s.sh
@ -77,6 +76,7 @@
        - ./tools/deployment/component/common/rabbitmq.sh
        - ./tools/deployment/component/common/memcached.sh
        - ./tools/deployment/component/keystone/keystone.sh
+        - ./tools/deployment/component/heat/heat.sh
        - ./tools/deployment/component/ranger/ranger.sh
        - ./tools/deployment/component/ranger/ranger-agent.sh

@ -90,36 +90,12 @@
      osh_params:
        container_distro_name: ubuntu
        container_distro_version: bionic
-        feature_gates: apparmor
      gate_scripts:
        - ./tools/deployment/common/install-packages.sh
        - ./tools/deployment/common/deploy-k8s.sh
        - ./tools/deployment/common/setup-client.sh
        - ./tools/deployment/component/mini-mirror/mini-mirror.sh

- job:
-    name: osh-addons-minimirror-ranger-apparmor
-    parent: osh-addons-base
-    run: tools/gate/playbooks/osh-gate-runner.yaml
-    vars:
-      osh_params:
-        openstack_release: ocata
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-        feature_gates: apparmor
-      gate_scripts:
-        - ./tools/deployment/common/install-packages.sh
-        - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/mini-mirror/mini-mirror.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/ranger/ranger.sh
-        - ./tools/deployment/component/ranger/ranger-agent.sh
-
 - job:
    name: osh-addons-sonobuoy-apparmor
    parent: osh-addons-base
@ -143,3 +119,43 @@
        - ./tools/deployment/component/keystone/keystone.sh
        - ./tools/deployment/component/ceph/radosgateway.sh
        - ./tools/deployment/component/sonobuoy/sonobuoy.sh
+
+- job:
+    name: osh-addons-ranger-apparmor
+    parent: osh-addons-base
+    run: tools/gate/playbooks/osh-gate-runner.yaml
+    vars:
+      osh_params:
+        openstack_release: stein
+        container_distro_name: ubuntu
+        container_distro_version: bionic
+        feature_gates: apparmor
+      gate_scripts:
+        - ./tools/deployment/common/install-packages.sh
+        - ./tools/deployment/common/deploy-k8s.sh
+        - ./tools/deployment/common/setup-client.sh
+        - ./tools/deployment/component/common/ingress.sh
+        - ./tools/deployment/component/common/mariadb.sh
+        - ./tools/deployment/component/common/rabbitmq.sh
+        - ./tools/deployment/component/common/memcached.sh
+        - ./tools/deployment/component/keystone/keystone.sh
+        - ./tools/deployment/component/heat/heat.sh
+        - ./tools/deployment/component/ranger/ranger.sh
+        - ./tools/deployment/component/ranger/ranger-agent.sh
+
+- job:
+    name: osh-addons-mini-mirror-apparmor
+    parent: osh-addons-base
+    run: tools/gate/playbooks/osh-gate-runner.yaml
+    timeout: 7200
+    nodeset: openstack-helm-single-node
+    vars:
+      osh_params:
+        container_distro_name: ubuntu
+        container_distro_version: bionic
+        feature_gates: apparmor
+      gate_scripts:
+        - ./tools/deployment/common/install-packages.sh
+        - ./tools/deployment/common/deploy-k8s.sh
+        - ./tools/deployment/common/setup-client.sh
+        - ./tools/deployment/component/mini-mirror/mini-mirror.sh
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@ -27,4 +27,5 @@
    experimental:
      jobs:
        - osh-addons-sonobuoy-apparmor
-        - osh-addons-minimirror-ranger-apparmor
+        - osh-addons-ranger-apparmor
+        - osh-addons-mini-mirror-apparmor