From 7d81d978b82f8e2e1079c5c3258feca23491faf8 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Thu, 21 Jan 2021 14:23:20 +0100 Subject: [PATCH 1/2] Fix nightly bundle check Signed-off-by: Flavius Lacatusu --- .github/bin/check-nightly-olm-bundle.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/bin/check-nightly-olm-bundle.sh b/.github/bin/check-nightly-olm-bundle.sh index 900c55d82..bbf0faab5 100755 --- a/.github/bin/check-nightly-olm-bundle.sh +++ b/.github/bin/check-nightly-olm-bundle.sh @@ -71,21 +71,29 @@ installOperatorSDK() { } isActualNightlyOlmBundleCSVFiles() { - cd "${ROOT_PROJECT_DIR}" + local CSV_FILE_KUBERNETES="deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml" + local CSV_FILE_OPENSHIFT="deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml" + local CRD_FILE_KUBERNETES="deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml" + local CRD_FILE_OPENSHIFT="deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml" + export NO_DATE_UPDATE="true" export NO_INCREMENT="true" - source "${ROOT_PROJECT_DIR}/olm/update-nightly-bundle.sh" - CSV_FILE_KUBERNETES="deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml" - CSV_FILE_OPENSHIFT="deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml" + cd "${ROOT_PROJECT_DIR}" + source "${ROOT_PROJECT_DIR}/olm/update-nightly-bundle.sh" IFS=$'\n' read -d '' -r -a changedFiles < <( git ls-files -m ) || true for file in "${changedFiles[@]}" do + echo $file if [ "${CSV_FILE_KUBERNETES}" == "${file}" ] || [ "${CSV_FILE_OPENSHIFT}" == "${file}" ]; then echo "[ERROR] Nightly bundle file ${file} should be updated in your pr, please. Use script 'che-operator/olm/update-nightly-bundle.sh' for this purpose." exit 1 fi + if [ "${CRD_FILE_KUBERNETES}" == "${file}" ] || [ "${CRD_FILE_OPENSHIFT}" == "${file}" ]; then + echo "[ERROR] Nightly bundle file ${file} should be updated in your pr, please. Use script 'che-operator/olm/update-nightly-bundle.sh' for this purpose." + exit 1 + fi done echo "[INFO] Nightly Olm bundle is in actual state." } From e2a40ce095320a7f35d9f1f94f409cdabd51aea2 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Thu, 21 Jan 2021 16:21:38 +0100 Subject: [PATCH 2/2] Fix Signed-off-by: Flavius Lacatusu --- .github/bin/check-nightly-olm-bundle.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/bin/check-nightly-olm-bundle.sh b/.github/bin/check-nightly-olm-bundle.sh index bbf0faab5..fe5501f6d 100755 --- a/.github/bin/check-nightly-olm-bundle.sh +++ b/.github/bin/check-nightly-olm-bundle.sh @@ -70,7 +70,7 @@ installOperatorSDK() { fi } -isActualNightlyOlmBundleCSVFiles() { +checkNightlyOlmBundle() { local CSV_FILE_KUBERNETES="deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml" local CSV_FILE_OPENSHIFT="deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml" local CRD_FILE_KUBERNETES="deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml" @@ -101,6 +101,6 @@ isActualNightlyOlmBundleCSVFiles() { installYq installOperatorSDK check_che_crds -isActualNightlyOlmBundleCSVFiles +checkNightlyOlmBundle echo "[INFO] Done."