Skip to content

Commit 52e0293

Browse files
committed
ci: try to start bundle with macadam
1 parent bdb46f7 commit 52e0293

1 file changed

Lines changed: 34 additions & 28 deletions

File tree

ci.sh

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ cat > /tmp/ignoretests.txt << EOF
1818
[sig-network] Proxy version v1 A set of valid responses are returned for both pod and service ProxyWithPath [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]
1919
EOF
2020

21-
./shellcheck.sh
22-
./snc.sh
23-
24-
echo "### Extracting openshift-tests binary"
25-
mkdir /tmp/os-test
26-
export TESTS_IMAGE=$(oc --kubeconfig=crc-tmp-install-data/auth/kubeconfig adm release info -a "${HOME}"/pull-secret --image-for=tests)
27-
oc image extract -a "${HOME}"/pull-secret "${TESTS_IMAGE}" --path=/usr/bin/openshift-tests:/tmp/os-test/.
28-
chmod +x /tmp/os-test/openshift-tests
29-
sudo mv /tmp/os-test/openshift-tests /usr/local/bin/
30-
31-
# Run createdisk script
32-
export CRC_ZSTD_EXTRA_FLAGS="-10 --long"
33-
./createdisk.sh crc-tmp-install-data
21+
# ./shellcheck.sh
22+
# ./snc.sh
23+
#
24+
# echo "### Extracting openshift-tests binary"
25+
# mkdir /tmp/os-test
26+
# export TESTS_IMAGE=$(oc --kubeconfig=crc-tmp-install-data/auth/kubeconfig adm release info -a "${HOME}"/pull-secret --image-for=tests)
27+
# oc image extract -a "${HOME}"/pull-secret "${TESTS_IMAGE}" --path=/usr/bin/openshift-tests:/tmp/os-test/.
28+
# chmod +x /tmp/os-test/openshift-tests
29+
# sudo mv /tmp/os-test/openshift-tests /usr/local/bin/
30+
#
31+
# # Run createdisk script
32+
# export CRC_ZSTD_EXTRA_FLAGS="-10 --long"
33+
# ./createdisk.sh crc-tmp-install-data
3434

3535
function destroy_cluster () {
3636
# Destroy the cluster
@@ -56,20 +56,26 @@ unset KUBECONFIG
5656
sudo rm -fr /etc/NetworkManager/dnsmasq.d/*
5757
sudo systemctl reload NetworkManager
5858

59-
git clone https://github.com/code-ready/crc.git
60-
pushd crc
61-
podman run --rm -v ${PWD}:/data:Z registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 /bin/bash -c "cd /data && make cross"
62-
sudo mv out/linux-amd64/crc /usr/local/bin/
63-
popd
59+
# run-with-macadam smoke test
60+
wget https://developers.redhat.com/content-gateway/file/pub/openshift-v4/clients/crc/bundles/openshift/4.21.0/crc_libvirt_4.21.0_amd64.crcbundle
61+
export CRC_BUNDLE_PATH=$(pwd)/crc_libvirt_4.21.0_amd64.crcbundle
62+
export PULL_SECRET_PATH="${HOME}/pull-secret"
63+
./run-with-macadam.py
64+
65+
# git clone https://github.com/code-ready/crc.git
66+
# pushd crc
67+
# podman run --rm -v ${PWD}:/data:Z registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 /bin/bash -c "cd /data && make cross"
68+
# sudo mv out/linux-amd64/crc /usr/local/bin/
69+
# popd
6470

65-
crc config set bundle crc_libvirt_*.crcbundle
66-
crc setup
67-
crc start --disk-size 80 -m 24000 -c 10 -p "${HOME}"/pull-secret --log-level debug
71+
# crc config set bundle crc_libvirt_*.crcbundle
72+
# crc setup
73+
# crc start --disk-size 80 -m 24000 -c 10 -p "${HOME}"/pull-secret --log-level debug
6874

69-
mkdir -p crc-tmp-install-data/test-artifacts
70-
export KUBECONFIG="${HOME}"/.crc/machines/crc/kubeconfig
71-
openshift-tests run kubernetes/conformance --dry-run | grep -F -v -f /tmp/ignoretests.txt | openshift-tests run -o crc-tmp-install-data/test-artifacts/e2e.log --junit-dir crc-tmp-install-data/test-artifacts/junit --disable-monitor alert-summary-serializer,metrics-endpoints-down,metrics-api-availability,monitoring-statefulsets-recreation,pod-network-avalibility,legacy-test-framework-invariants,api-unreachable-from-client-metrics,clusteroperator-collector -f -
72-
rc=$?
73-
echo "${rc}" > /tmp/test-return
74-
set -e
75-
echo "### Done! (${rc})"
75+
# mkdir -p crc-tmp-install-data/test-artifacts
76+
# export KUBECONFIG="${HOME}"/.crc/machines/crc/kubeconfig
77+
# openshift-tests run kubernetes/conformance --dry-run | grep -F -v -f /tmp/ignoretests.txt | openshift-tests run -o crc-tmp-install-data/test-artifacts/e2e.log --junit-dir crc-tmp-install-data/test-artifacts/junit --disable-monitor alert-summary-serializer,metrics-endpoints-down,metrics-api-availability,monitoring-statefulsets-recreation,pod-network-avalibility,legacy-test-framework-invariants,api-unreachable-from-client-metrics,clusteroperator-collector -f -
78+
# rc=$?
79+
# echo "${rc}" > /tmp/test-return
80+
# set -e
81+
# echo "### Done! (${rc})"

0 commit comments

Comments
 (0)