From 942c19243b1ea938c275efa1b91647588c0bc513 Mon Sep 17 00:00:00 2001 From: diwakar thyagaraj Date: Thu, 4 Jun 2020 17:32:21 +0000 Subject: [PATCH] Enable CI for Porthole 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 --- .../utilities/000-install-packages.sh | 1 + .../utilities/001-setup-apparmor-profiles.sh | 1 + tools/deployment/utilities/002-deploy-k8s.sh | 1 + .../utilities/005-calicoctl-utility.sh | 2 +- .../deployment/utilities/010-ceph-utility.sh | 3 +- .../utilities/020-compute-utility.sh | 2 +- .../utilities/030-etcdctl-utility.sh | 2 +- .../utilities/040-mysqlclient-utility.sh | 2 +- .../utilities/050-openstack-utility.sh | 7 ++-- .../utilities/060-postgresql-utility.sh | 2 +- zuul.d/base.yaml | 32 +++++++++++++++++-- 11 files changed, 41 insertions(+), 14 deletions(-) create mode 120000 tools/deployment/utilities/000-install-packages.sh create mode 120000 tools/deployment/utilities/001-setup-apparmor-profiles.sh create mode 120000 tools/deployment/utilities/002-deploy-k8s.sh diff --git a/tools/deployment/utilities/000-install-packages.sh b/tools/deployment/utilities/000-install-packages.sh new file mode 120000 index 00000000..a5f43e66 --- /dev/null +++ b/tools/deployment/utilities/000-install-packages.sh @@ -0,0 +1 @@ +../apparmor/000-install-packages.sh \ No newline at end of file diff --git a/tools/deployment/utilities/001-setup-apparmor-profiles.sh b/tools/deployment/utilities/001-setup-apparmor-profiles.sh new file mode 120000 index 00000000..2cd5b410 --- /dev/null +++ b/tools/deployment/utilities/001-setup-apparmor-profiles.sh @@ -0,0 +1 @@ +../apparmor/001-setup-apparmor-profiles.sh \ No newline at end of file diff --git a/tools/deployment/utilities/002-deploy-k8s.sh b/tools/deployment/utilities/002-deploy-k8s.sh new file mode 120000 index 00000000..447f5e10 --- /dev/null +++ b/tools/deployment/utilities/002-deploy-k8s.sh @@ -0,0 +1 @@ +../apparmor/002-deploy-k8s.sh \ No newline at end of file diff --git a/tools/deployment/utilities/005-calicoctl-utility.sh b/tools/deployment/utilities/005-calicoctl-utility.sh index edf34fa8..b51e73e6 100755 --- a/tools/deployment/utilities/005-calicoctl-utility.sh +++ b/tools/deployment/utilities/005-calicoctl-utility.sh @@ -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 diff --git a/tools/deployment/utilities/010-ceph-utility.sh b/tools/deployment/utilities/010-ceph-utility.sh index fb77df3d..6f8596cd 100755 --- a/tools/deployment/utilities/010-ceph-utility.sh +++ b/tools/deployment/utilities/010-ceph-utility.sh @@ -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 \ No newline at end of file diff --git a/tools/deployment/utilities/020-compute-utility.sh b/tools/deployment/utilities/020-compute-utility.sh index 8b2e90ab..3c580e2e 100755 --- a/tools/deployment/utilities/020-compute-utility.sh +++ b/tools/deployment/utilities/020-compute-utility.sh @@ -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 \ No newline at end of file diff --git a/tools/deployment/utilities/030-etcdctl-utility.sh b/tools/deployment/utilities/030-etcdctl-utility.sh index 4a470946..ba529876 100755 --- a/tools/deployment/utilities/030-etcdctl-utility.sh +++ b/tools/deployment/utilities/030-etcdctl-utility.sh @@ -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 \ No newline at end of file diff --git a/tools/deployment/utilities/040-mysqlclient-utility.sh b/tools/deployment/utilities/040-mysqlclient-utility.sh index f14f3ced..ea1a921f 100755 --- a/tools/deployment/utilities/040-mysqlclient-utility.sh +++ b/tools/deployment/utilities/040-mysqlclient-utility.sh @@ -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 \ No newline at end of file diff --git a/tools/deployment/utilities/050-openstack-utility.sh b/tools/deployment/utilities/050-openstack-utility.sh index 1789918c..b2fe768c 100755 --- a/tools/deployment/utilities/050-openstack-utility.sh +++ b/tools/deployment/utilities/050-openstack-utility.sh @@ -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 \ No newline at end of file +helm status openstack-utility \ No newline at end of file diff --git a/tools/deployment/utilities/060-postgresql-utility.sh b/tools/deployment/utilities/060-postgresql-utility.sh index c000c55f..d4722d16 100755 --- a/tools/deployment/utilities/060-postgresql-utility.sh +++ b/tools/deployment/utilities/060-postgresql-utility.sh @@ -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 \ No newline at end of file diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 4f5a8226..c8cbe19a 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -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