Disable capd job from voting
* slightly increase timeout for gate script runner job * disable capd job from voting due to instability * fix validate_docs script: we should either filter site to validate from command line or from sites_to_skip variable * enable document validation for docker test site Signed-off-by: Ruslan Aliev <raliev@mirantis.com> Change-Id: If38e6e24f7187d59072bc7435c700b829e2dafba Closes: #649
This commit is contained in:
parent
614f7fe3bc
commit
1faeb29f43
@ -14,4 +14,5 @@
|
||||
|
||||
set -xe
|
||||
|
||||
kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT --request-timeout 10s get crd --all-namespaces 1>&2
|
||||
kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT --request-timeout 10s get pods --all-namespaces 1>&2
|
||||
|
@ -14,4 +14,5 @@
|
||||
|
||||
set -xe
|
||||
|
||||
kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT wait --for=condition=available deploy --all --timeout=1000s -A 1>&2
|
||||
kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT wait --for=condition=Established crd --all --timeout=300s -A 1>&2
|
||||
kubectl --kubeconfig $KUBECONFIG --context $KCTL_CONTEXT wait --for=condition=available deploy --all --timeout=1000s -A 1>&2
|
||||
|
@ -17,3 +17,16 @@ phases:
|
||||
- name: kubectl-wait-pods-any-ephemeral
|
||||
- name: clusterctl-move
|
||||
- name: workers-target
|
||||
validation:
|
||||
kindsToSkip:
|
||||
- Clusterctl
|
||||
- VariableCatalogue
|
||||
crdList:
|
||||
- airshipctl/manifests/function/airshipctl-schemas
|
||||
- airshipctl/manifests/function/cert-manager/v1.1.0
|
||||
---
|
||||
apiVersion: airshipit.org/v1alpha1
|
||||
kind: PhasePlan
|
||||
metadata:
|
||||
name: iso
|
||||
$patch: delete
|
||||
|
@ -1,5 +1,5 @@
|
||||
resources:
|
||||
- ../../../phases
|
||||
- ../../../type/gating/phases
|
||||
- ../../../function/airshipctl-base-catalogues
|
||||
patchesStrategicMerge:
|
||||
- plan_patch.yaml
|
||||
|
@ -25,11 +25,10 @@ set -o pipefail
|
||||
: ${MANIFEST_PATH:="manifests/site"}
|
||||
: ${SITE_ROOTS:="$(basename "${PWD}")/${MANIFEST_PATH}"}
|
||||
: ${MANIFEST_REPO_URL:="https://review.opendev.org/airship/airshipctl"}
|
||||
: ${SITES_TO_SKIP:="az-test-site docker-test-site openstack-test-site"}
|
||||
|
||||
: ${SITES_TO_SKIP:="az-test-site gcp-test-site openstack-test-site"}
|
||||
|
||||
# Name of specific site to be validated
|
||||
SITE=${SITE:-$1}
|
||||
SITE=$1
|
||||
TMP=$(mktemp -d)
|
||||
|
||||
# TODO: use `airshipctl config` to do this once all the needed knobs are exposed
|
||||
@ -66,15 +65,8 @@ EOL
|
||||
|
||||
for site_root in ${SITE_ROOTS}; do
|
||||
for site in $(ls ${MANIFEST_ROOT}/${site_root}); do
|
||||
# TODO (raliev) remove this condition later
|
||||
# Temporary solution to disable validation for outdated sites, this list will be removed eventually
|
||||
sites_to_skip=(${SITES_TO_SKIP})
|
||||
if [[ " ${sites_to_skip[@]} " =~ " ${site} " ]]; then
|
||||
continue
|
||||
fi
|
||||
|
||||
# Validate only specific site if set
|
||||
if [ ! -z "$SITE" ] && [ "$site" != "$SITE" ]; then
|
||||
if [[ -z "$SITE" && " ${sites_to_skip[@]} " =~ " ${site} " ]] || [[ ! -z "$SITE" && "$site" != $SITE ]]; then
|
||||
continue
|
||||
fi
|
||||
|
||||
|
@ -101,7 +101,7 @@
|
||||
- job:
|
||||
name: airship-airshipctl-gate-script-runner
|
||||
attempts: 1
|
||||
timeout: 8400
|
||||
timeout: 9000
|
||||
pre-run:
|
||||
- playbooks/airship-airshipctl-deploy-docker.yaml
|
||||
- playbooks/airship-airshipctl-build-gate.yaml
|
||||
@ -215,7 +215,7 @@
|
||||
- CLUSTER=ephemeral-cluster KIND_CONFIG=./tools/deployment/templates/kind-cluster-with-extramounts ./tools/deployment/kind/start_kind.sh
|
||||
- ./tools/deployment/23_pull_documents.sh
|
||||
- ./tools/deployment/25_deploy_gating.sh
|
||||
voting: true
|
||||
voting: false
|
||||
- job:
|
||||
name: airship-airshipctl-docker-kubebench-conformance
|
||||
attempts: 1
|
||||
|
Loading…
Reference in New Issue
Block a user