fix(ci): cleanup packagemanifest APIService during deploy stop job

operator-framework · Oct 25, 2018 · ed395e0 · ed395e0
1 parent f61307b
commit ed395e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -225,6 +225,7 @@ e2e-teardown:
   script:
   - echo $CD_KUBECONFIG | base64 -d > kubeconfig
   - export KUBECONFIG=./kubeconfig
+  - kubectl delete apiservice v1alpha1.packages.apps.redhat.com --ignore-not-found=true
   - kubectl delete ns --ignore-not-found=true e2e-${CI_COMMIT_REF_SLUG}-${SHA8}
   - kubectl get pods -o wide -n e2e-${CI_COMMIT_REF_SLUG}-${SHA8}
   stage: test_teardown
@@ -284,6 +285,7 @@ stop-preview:
   script:
   - echo $CD_KUBECONFIG | base64 -d > kubeconfig
   - export KUBECONFIG=./kubeconfig
+  - kubectl delete apiservice v1alpha1.packages.apps.redhat.com --ignore-not-found=true
   - kubectl delete ns --ignore-not-found=true ci-olm-${CI_COMMIT_REF_SLUG}
   - kubectl get pods -o wide -n ci-olm-${CI_COMMIT_REF_SLUG}
   stage: deploy_preview

diff --git a/.gitlab-ci/base_jobs.libsonnet b/.gitlab-ci/base_jobs.libsonnet
@@ -136,6 +136,7 @@ local appr = utils.appr;
         before_script: [],
         script:
             k8s.setKubeConfig(self.localvars.kubeconfig) + [
+                "kubectl delete apiservice v1alpha1.packages.apps.redhat.com --ignore-not-found=true",
                 "kubectl delete ns --ignore-not-found=true %s" % self.localvars.namespace,
                 "kubectl get pods -o wide -n %s" % self.localvars.namespace,
             ],