Skip to content

Commit e4f5b7a

Browse files
committed
Remove ttl.sh dependency for microshift gh action
Remove the ttl.sh dependency and instead use podman's service. Also, remove the irrelevant code and change the name of test runner file to test_microshift.sh
1 parent 40b47b9 commit e4f5b7a

2 files changed

Lines changed: 12 additions & 18 deletions

File tree

.github/workflows/test-on-microshift.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,30 @@ jobs:
4444
run: |
4545
curl -L -o minc https://github.com/minc-org/minc/releases/latest/download/minc_linux_amd64
4646
chmod +x minc
47-
./minc config set provider docker
4847
./minc create --log-level debug
4948
5049
- name: Install Tekton Chains and Run e2e tests
5150
working-directory: ${{ github.workspace }}/src/github.com/tektoncd/chains
5251

5352
run: |
53+
echo -e "\n************************ Install openshift client ************************\n"
5454
wget https://github.com/okd-project/okd/releases/download/4.19.0-okd-scos.6/openshift-client-linux-amd64-rhel9-4.19.0-okd-scos.6.tar.gz
5555
tar -xzvf openshift-client-linux-amd64-rhel9-4.19.0-okd-scos.6.tar.gz
5656
export PATH=${PATH}:${PWD}
5757
58+
echo -e "\n************************ Setup Podman ************************\n"
59+
sudo podman system service --time=0 tcp://localhost:24816 &
60+
sleep 7
61+
echo -e "\ntest the podman tcp connection\n"
62+
curl http://localhost:24816/_ping
63+
export KO_DOCKER_PATH=ko.local
64+
export DOCKER_HOST=tcp://localhost:24816
65+
66+
67+
echo -e "\n************************ Starting e2e ************************\n"
5868
oc adm policy add-scc-to-user anyuid -z tekton-pipelines-controller
5969
oc adm policy add-scc-to-user anyuid -z tekton-pipelines-webhook
6070
6171
export KUBECONFIG=$HOME/.kube/config
6272
63-
source ${{ github.workspace }}/src/github.com/tektoncd/chains/test/crc_test.sh
73+
source ${{ github.workspace }}/src/github.com/tektoncd/chains/test/microshift_test.sh
Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,8 @@ set -e
33

44
export namespace="${NAMESPACE:-tekton-chains}"
55

6-
function start_registry() {
7-
running="$(docker inspect -f '{{.State.Running}}' ${REG_NAME} 2>/dev/null || echo false)"
8-
9-
if [[ ${running} != "true" ]];then
10-
docker rm -f kind-registry || true
11-
docker run \
12-
-d --restart=always -p "127.0.0.1:${REG_PORT}:5000" \
13-
-e REGISTRY_HTTP_SECRET=secret \
14-
--name "${REG_NAME}" \
15-
registry:2
16-
fi
17-
}
18-
196
function install_chains() {
207
echo ">> Deploying Tekton Chains"
21-
export KO_DOCKER_REPO=ttl.sh
228
ko apply -f config/ || fail_test "Tekton Chains installation failed"
239
ko resolve -f config > release.yaml
2410
yq 'del(.spec.template.spec.containers[]?.securityContext.runAsUser, .spec.template.spec.containers[]?.securityContext.runAsGroup)' release.yaml | kubectl apply -f -
@@ -158,8 +144,6 @@ function wait_until_pods_running() {
158144

159145
curl https://storage.googleapis.com/tekton-releases/pipeline/latest/release.notags.yaml | yq 'del(.spec.template.spec.containers[]?.securityContext.runAsUser, .spec.template.spec.containers[]?.securityContext.runAsGroup)' | kubectl apply -f -
160146

161-
start_registry
162-
163147
install_chains
164148

165149
install_spire

0 commit comments

Comments
 (0)