diff --git a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml index 49551f201..699dcf9f2 100644 --- a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml @@ -7,13 +7,13 @@ metadata: categories: Developer Tools certified: "false" containerImage: quay.io/eclipse/che-operator:nightly - createdAt: "2020-09-09T06:56:23Z" + createdAt: "2020-09-14T08:38:35Z" description: A Kube-native development solution that delivers portable and collaborative developer workspaces. operatorframework.io/suggested-namespace: eclipse-che repository: https://github.com/eclipse/che-operator support: Eclipse Foundation - name: eclipse-che-preview-kubernetes.v7.18.0-0.nightly + name: eclipse-che-preview-kubernetes.v7.19.0-1.nightly namespace: placeholder spec: apiservicedefinitions: {} @@ -353,4 +353,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.18.0-0.nightly + version: 7.19.0-1.nightly diff --git a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml index d59d9a118..d43fd14d3 100644 --- a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -7,13 +7,13 @@ metadata: categories: Developer Tools certified: "false" containerImage: quay.io/eclipse/che-operator:nightly - createdAt: "2020-09-09T06:56:23Z" + createdAt: "2020-09-14T08:38:35Z" description: A Kube-native development solution that delivers portable and collaborative developer workspaces. operatorframework.io/suggested-namespace: eclipse-che repository: https://github.com/eclipse/che-operator support: Eclipse Foundation - name: eclipse-che-preview-openshift.v7.18.0-0.nightly + name: eclipse-che-preview-openshift.v7.19.0-1.nightly namespace: placeholder spec: apiservicedefinitions: {} @@ -400,4 +400,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.18.0-0.nightly + version: 7.19.0-1.nightly diff --git a/olm/incrementNightlyBundles.sh b/olm/incrementNightlyBundles.sh index d56a66964..d1a65ed8c 100755 --- a/olm/incrementNightlyBundles.sh +++ b/olm/incrementNightlyBundles.sh @@ -37,7 +37,9 @@ incrementNightlyVersion() { CLUSTER_SERVICE_VERSION=$(yq -r ".channels[] | select(.name == \"stable\") | .currentCSV" "${PACKAGE_FILE_PATH}") STABLE_PACKAGE_VERSION=$(echo "${CLUSTER_SERVICE_VERSION}" | sed -e "s/${PACKAGE_NAME}.v//") - newVersion="${STABLE_PACKAGE_VERSION}-$((incrementPart+1)).nightly" + parseStableVersion + STABLE_MINOR_VERSION=$((STABLE_MINOR_VERSION+1)) + newVersion="${STABLE_MAJOR_VERSION}.${STABLE_MINOR_VERSION}.0-$((incrementPart+1)).nightly" echo "[INFO] Set up nightly ${platform} version: ${newVersion}" yq -rY "(.spec.version) = \"${newVersion}\" | (.metadata.name) = \"eclipse-che-preview-${platform}.v${newVersion}\"" "${CSV}" > "${CSV}.old" @@ -56,3 +58,12 @@ getNightlyVersionIncrementPart() { echo "${incrementPart}" } + +parseStableVersion() { + local majorAndMinor=${STABLE_PACKAGE_VERSION%.*} + STABLE_MINOR_VERSION=${majorAndMinor#*.} + STABLE_MAJOR_VERSION=${majorAndMinor%.*} + + export STABLE_MAJOR_VERSION + export STABLE_MINOR_VERSION +}