Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.1] Dirty hack to unlock CI #749

Merged
merged 2 commits into from
Aug 14, 2020
Merged

[release-1.1] Dirty hack to unlock CI #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a35c3
Dirty hack to unlock CI
tiraboschi Aug 13, 2020
7e605c2
Skipping SCC check on 1.0.0 -> 1.1.0+PR
tiraboschi Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/Dockerfile.registry.kubevirt.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ USER root
RUN find /registry/kubevirt-hyperconverged/ -type f -exec sed -E -i 's|^(\s*)- name: KVM_EMULATION$|\1- name: KVM_EMULATION\n\1 value: "true"|' {} \; || :

RUN echo "HCO_VERSION: ${HCO_VERSION}"
RUN if [ -n "$KUBEVIRT_PROVIDER" ]; then sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|registry:5000/kubevirt/hyperconverged-cluster-operator:latest|g" /registry/kubevirt-hyperconverged/${HCO_VERSION}/kubevirt-hyperconverged-operator.v${HCO_VERSION}.clusterserviceversion.yaml; else sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|registry.svc.ci.openshift.org/${OPENSHIFT_BUILD_NAMESPACE}/stable:hyperconverged-cluster-operator|g" /registry/kubevirt-hyperconverged/${HCO_VERSION}/kubevirt-hyperconverged-operator.v${HCO_VERSION}.clusterserviceversion.yaml; fi
RUN if [ -n "$KUBEVIRT_PROVIDER" ]; then sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|registry:5000/kubevirt/hyperconverged-cluster-operator:latest|g" /registry/kubevirt-hyperconverged/${HCO_VERSION}/kubevirt-hyperconverged-operator.v${HCO_VERSION}.clusterserviceversion.yaml; else sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|default-route-openshift-image-registry.apps.build01.ci.devcluster.openshift.com/${OPENSHIFT_BUILD_NAMESPACE}/stable:hyperconverged-cluster-operator|g" /registry/kubevirt-hyperconverged/${HCO_VERSION}/kubevirt-hyperconverged-operator.v${HCO_VERSION}.clusterserviceversion.yaml; fi
RUN cat /registry/kubevirt-hyperconverged/kubevirt-hyperconverged.package.yaml

# Initialize the database
Expand Down
2 changes: 1 addition & 1 deletion deploy/Dockerfile.registry.upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ USER root
RUN if [ -n "$KUBEVIRT_PROVIDER" ]; then \
sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|registry:5000/kubevirt/hyperconverged-cluster-operator:latest|g" /registry/kubevirt-hyperconverged/${UPGRADE_VERSION}/kubevirt-hyperconverged-operator.v${UPGRADE_VERSION}.clusterserviceversion.yaml; \
else \
sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|registry.svc.ci.openshift.org/${OPENSHIFT_BUILD_NAMESPACE}/stable:hyperconverged-cluster-operator|g" /registry/kubevirt-hyperconverged/${UPGRADE_VERSION}/kubevirt-hyperconverged-operator.v${UPGRADE_VERSION}.clusterserviceversion.yaml; \
sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|default-route-openshift-image-registry.apps.build01.ci.devcluster.openshift.com/${OPENSHIFT_BUILD_NAMESPACE}/stable:hyperconverged-cluster-operator|g" /registry/kubevirt-hyperconverged/${UPGRADE_VERSION}/kubevirt-hyperconverged-operator.v${UPGRADE_VERSION}.clusterserviceversion.yaml; \
fi
# Initialize the database
RUN initializer --manifests /registry/kubevirt-hyperconverged --output bundles.db
Expand Down
2 changes: 1 addition & 1 deletion deploy/Dockerfile.registry.upgrade-prev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ USER root
RUN if [ -n "$KUBEVIRT_PROVIDER" ]; then \
sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|registry:5000/kubevirt/hyperconverged-cluster-operator:latest|g" /registry/kubevirt-hyperconverged/${UPGRADE_VERSION}/kubevirt-hyperconverged-operator.v${UPGRADE_VERSION}.clusterserviceversion.yaml; \
else \
sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|registry.svc.ci.openshift.org/${OPENSHIFT_BUILD_NAMESPACE}/stable:hyperconverged-cluster-operator|g" /registry/kubevirt-hyperconverged/${UPGRADE_VERSION}/kubevirt-hyperconverged-operator.v${UPGRADE_VERSION}.clusterserviceversion.yaml; \
sed -i "s|quay.io/kubevirt/hyperconverged-cluster-operator:.*$|default-route-openshift-image-registry.apps.build01.ci.devcluster.openshift.com/${OPENSHIFT_BUILD_NAMESPACE}/stable:hyperconverged-cluster-operator|g" /registry/kubevirt-hyperconverged/${UPGRADE_VERSION}/kubevirt-hyperconverged-operator.v${UPGRADE_VERSION}.clusterserviceversion.yaml; \
fi
# Initialize the database
RUN initializer --manifests /registry/kubevirt-hyperconverged --output bundles.db
Expand Down
8 changes: 7 additions & 1 deletion hack/upgrade-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,5 +237,11 @@ timeout 15m bash -c 'export CMD="${CMD}";exec ./hack/check-state.sh'

Msg "verify new operator version reported after the upgrade"
./hack/retry.sh 10 30 "CMD=${CMD} HCO_RESOURCE_NAME=${HCO_RESOURCE_NAME} HCO_NAMESPACE=${HCO_NAMESPACE} TARGET_VERSION=${TARGET_VERSION} hack/check_hco_version.sh"
dump_sccs_after

if [[ -n $PREV ]]; then
# ignoring scc check on 1.0.0 -> 1.1.0+PR because in 1.0.0 we ship CDI v1.13.1 which was bugged
echo "----- Skipping SCC check"
else
dump_sccs_after
fi
echo "upgrade-test completed successfully."