airship/porthole
Code Issues Proposed changes

Enable CI for Porthole

Browse Source 
1) Standardizing the usage of Deployment Scripts since porthole is cloned
to openstack-helm project as Per ReadMe as well.
https://review.opendev.org/gitweb?p=airship/porthole.git;a=blob;f=README.md;h=ec953ff18b5286213b8eee57eacbab0f2a331e79;hb=refs/heads/master#l30

2) Changed Apparmor Scripts to run on Demand to reduce resources
needed.

Change-Id: I5e682684cfd4bec70542f0951dbcf33852ad78b5
Signed-off-by: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>
This commit is contained in:
diwakar thyagaraj 2020-06-04 17:32:21 +00:00
parent fa21592857
commit 942c19243b
11 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/deployment/utilities/000-install-packages.sh Symbolic link
View File

@ -0,0 +1 @@
../apparmor/000-install-packages.sh

1
tools/deployment/utilities/001-setup-apparmor-profiles.sh Symbolic link
View File

@ -0,0 +1 @@
../apparmor/001-setup-apparmor-profiles.sh

1
tools/deployment/utilities/002-deploy-k8s.sh Symbolic link
View File

@ -0,0 +1 @@
../apparmor/002-deploy-k8s.sh

2
tools/deployment/utilities/005-calicoctl-utility.sh
View File

@ -6,7 +6,7 @@ helm upgrade --install calicoctl-utility ./charts/calicoctl-utility --namespace
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
: "${OSH_INFRA_PATH:="../../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace

3
tools/deployment/utilities/010-ceph-utility.sh
View File

@ -228,7 +228,7 @@ conf:
EOF
helm upgrade --install ceph-utility-config ./ceph-provisioners \
--namespace=utility \
--namespace=$namespace \
--values=/tmp/ceph-utility-config.yaml \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
@ -239,6 +239,5 @@ helm dependency update charts/ceph-utility
helm upgrade --install ceph-utility ./charts/ceph-utility --namespace=$namespace
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace

2
tools/deployment/utilities/020-compute-utility.sh
View File

@ -5,6 +5,6 @@ helm dependency update charts/compute-utility
helm upgrade --install compute-utility ./charts/compute-utility --namespace=$namespace
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
: "${OSH_INFRA_PATH:="../../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace

2
tools/deployment/utilities/030-etcdctl-utility.sh
View File

@ -5,6 +5,6 @@ helm dependency update charts/etcdctl-utility
helm upgrade --install etcdctl-utility ./charts/etcdctl-utility --namespace=$namespace
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
: "${OSH_INFRA_PATH:="../../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace

2
tools/deployment/utilities/040-mysqlclient-utility.sh
View File

@ -5,6 +5,6 @@ helm dependency update charts/mysqlclient-utility
helm upgrade --install mysqlclient-utility ./charts/mysqlclient-utility --namespace=$namespace
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
: "${OSH_INFRA_PATH:="../../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace

7
tools/deployment/utilities/050-openstack-utility.sh
View File

@ -5,12 +5,9 @@ helm dependency update charts/openstack-utility
helm upgrade --install openstack-utility ./charts/openstack-utility --namespace=$namespace
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
: "${OSH_INFRA_PATH:="../../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace
#NOTE: Validate Deployment info
helm status openstack-utility
export OS_CLOUD=openstack_helm
sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
openstack endpoint list
helm status openstack-utility

2
tools/deployment/utilities/060-postgresql-utility.sh
View File

@ -5,6 +5,6 @@ helm dependency update charts/postgresql-utility
helm upgrade --install postgresql-utility ./charts/postgresql-utility --namespace=$namespace
# Wait for Deployment
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
: "${OSH_INFRA_PATH:="../../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
./tools/deployment/common/wait-for-pods.sh $namespace

32
zuul.d/base.yaml
View File

@ -24,8 +24,7 @@
- airship-porthole-images-build-gate-mysqlclient-utility
- airship-porthole-images-build-gate-openstack-utility
- airship-porthole-images-build-gate-postgresql-utility
- airship-porthole-apparmor:
voting: false
- airship-porthole-deploy
gate:
jobs:
@ -37,9 +36,15 @@
- airship-porthole-images-build-gate-mysqlclient-utility
- airship-porthole-images-build-gate-openstack-utility
- airship-porthole-images-build-gate-postgresql-utility
- airship-porthole-deploy
- airship-porthole-apparmor:
voting: false
experimental:
jobs:
- airship-porthole-linter
- airship-porthole-apparmor
post:
jobs:
- airship-porthole-images-publish-calicoctl-utility
@ -81,6 +86,28 @@
timeout: 300
nodeset: airship-porthole-single-node
- job:
name: airship-porthole-deploy
description: Deploys All Utility Containers
timeout: 7200
run: tools/gate/playbooks/airship-porthole-gate-runner.yaml
post-run: tools/gate/playbooks/airship-porthole-collect-logs.yaml
nodeset: airship-porthole-single-node
vars:
gate_scripts:
- ./tools/deployment/utilities/000-install-packages.sh
- ./tools/deployment/utilities/001-setup-apparmor-profiles.sh
- ./tools/deployment/utilities/002-deploy-k8s.sh
- ./tools/deployment/utilities/005-calicoctl-utility.sh
- ./tools/deployment/utilities/010-ceph-utility.sh
- ./tools/deployment/utilities/020-compute-utility.sh
- ./tools/deployment/utilities/030-etcdctl-utility.sh
- ./tools/deployment/utilities/040-mysqlclient-utility.sh
- ./tools/deployment/utilities/050-openstack-utility.sh
- ./tools/deployment/utilities/060-postgresql-utility.sh
args:
chdir: "{{ zuul.project.src_dir }}"
- job:
name: airship-porthole-apparmor
description: Checks Pods for Apparmor profile
@ -95,6 +122,7 @@
- ./tools/deployment/apparmor/002-deploy-k8s.sh
- ./tools/deployment/apparmor/005-calicoctl-utility.sh
- ./tools/deployment/apparmor/010-ceph-utility.sh
- ./tools/deployment/apparmor/020-compute-utility.sh
- ./tools/deployment/apparmor/030-etcdctl-utility.sh
- ./tools/deployment/apparmor/040-mysqlclient-utility.sh
- ./tools/deployment/apparmor/050-openstack-utility.sh