Install PyYAML package using system apt or dnf

or fallback to pip --break-system-packages and reformat files Fixes #1772 Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com>
openshift-pipelines · Oct 10, 2024 · e0cb651 · e0cb651
1 parent 9e71fa3
commit e0cb651
Showing 1 changed file with 137 additions and 130 deletions.
diff --git a/hack/gh-workflow-ci.sh b/hack/gh-workflow-ci.sh
@@ -3,133 +3,140 @@
 set -eufo pipefail
 
 create_pac_github_app_secret() {
-	local app_private_key="${1}"
-	local application_id="${2}"
-	local webhook_secret="${3}"
-	kubectl delete secret -n pipelines-as-code pipelines-as-code-secret || true
-	kubectl -n pipelines-as-code create secret generic pipelines-as-code-secret \
-		--from-literal github-private-key="${app_private_key}" \
-		--from-literal github-application-id="${application_id}" \
-		--from-literal webhook.secret="${webhook_secret}"
-	kubectl patch configmap -n pipelines-as-code -p "{\"data\":{\"bitbucket-cloud-check-source-ip\": \"false\"}}" \
-		--type merge pipelines-as-code
-
-	# restart controller
-	kubectl -n pipelines-as-code delete pod -l app.kubernetes.io/name=controller
-
-	echo -n "Waiting for controller to restart"
-	i=0
-	while true; do
-		[[ ${i} == 120 ]] && exit 1
-		ep=$(kubectl get ep -n pipelines-as-code pipelines-as-code-controller -o jsonpath='{.subsets[*].addresses[*].ip}')
-		[[ -n ${ep} ]] && break
-		sleep 2
-		echo -n "."
-		i=$((i + 1))
-	done
-	echo
+  local app_private_key="${1}"
+  local application_id="${2}"
+  local webhook_secret="${3}"
+  kubectl delete secret -n pipelines-as-code pipelines-as-code-secret || true
+  kubectl -n pipelines-as-code create secret generic pipelines-as-code-secret \
+    --from-literal github-private-key="${app_private_key}" \
+    --from-literal github-application-id="${application_id}" \
+    --from-literal webhook.secret="${webhook_secret}"
+  kubectl patch configmap -n pipelines-as-code -p "{\"data\":{\"bitbucket-cloud-check-source-ip\": \"false\"}}" \
+    --type merge pipelines-as-code
+
+  # restart controller
+  kubectl -n pipelines-as-code delete pod -l app.kubernetes.io/name=controller
+
+  echo -n "Waiting for controller to restart"
+  i=0
+  while true; do
+    [[ ${i} == 120 ]] && exit 1
+    ep=$(kubectl get ep -n pipelines-as-code pipelines-as-code-controller -o jsonpath='{.subsets[*].addresses[*].ip}')
+    [[ -n ${ep} ]] && break
+    sleep 2
+    echo -n "."
+    i=$((i + 1))
+  done
+  echo
 }
 
 create_second_github_app_controller_on_ghe() {
-	local test_github_second_smee_url="${1}"
-	local test_github_second_private_key="${2}"
-	local test_github_second_webhook_secret="${3}"
-
-	# this is to handle compatibilty until the PR #1518 is merged
-	[[ -e ./hack/second-controller.py ]] || exit 0
-	python3 -m pip install PyYAML
-	./hack/second-controller.py \
-		--controller-image="ko" \
-		--smee-url="${test_github_second_smee_url}" \
-		--ingress-domain="paac-127-0-0-1.nip.io" \
-		--namespace="pipelines-as-code" \
-		ghe | tee /tmp/generated.yaml
-
-	ko apply -f /tmp/generated.yaml
-	kubectl delete secret -n pipelines-as-code ghe-secret || true
-	kubectl -n pipelines-as-code create secret generic ghe-secret \
-		--from-literal github-private-key="${test_github_second_private_key}" \
-		--from-literal github-application-id="2" \
-		--from-literal webhook.secret="${test_github_second_webhook_secret}"
-	sed "s/name: pipelines-as-code/name: ghe-configmap/" <config/302-pac-configmap.yaml | kubectl apply -n pipelines-as-code -f-
-	kubectl patch configmap -n pipelines-as-code ghe-configmap -p '{"data":{"application-name": "Pipelines as Code GHE"}}'
-	kubectl -n pipelines-as-code delete pod -l app.kubernetes.io/name=ghe-controller
+  local test_github_second_smee_url="${1}"
+  local test_github_second_private_key="${2}"
+  local test_github_second_webhook_secret="${3}"
+
+  if hash -v apt >/dev/null 2>&1; then
+    apt update &&
+      apt install -y python3-yaml
+  elif hash -v dnf >/dev/null 2>&1; then
+    dnf install -y python3-pyyaml
+  else
+    # TODO(chmouel): setup a virtualenvironment instead
+    python3 -m pip install --break-system-packages PyYAML
+  fi
+
+  ./hack/second-controller.py \
+    --controller-image="ko" \
+    --smee-url="${test_github_second_smee_url}" \
+    --ingress-domain="paac-127-0-0-1.nip.io" \
+    --namespace="pipelines-as-code" \
+    ghe | tee /tmp/generated.yaml
+
+  ko apply -f /tmp/generated.yaml
+  kubectl delete secret -n pipelines-as-code ghe-secret || true
+  kubectl -n pipelines-as-code create secret generic ghe-secret \
+    --from-literal github-private-key="${test_github_second_private_key}" \
+    --from-literal github-application-id="2" \
+    --from-literal webhook.secret="${test_github_second_webhook_secret}"
+  sed "s/name: pipelines-as-code/name: ghe-configmap/" <config/302-pac-configmap.yaml | kubectl apply -n pipelines-as-code -f-
+  kubectl patch configmap -n pipelines-as-code ghe-configmap -p '{"data":{"application-name": "Pipelines as Code GHE"}}'
+  kubectl -n pipelines-as-code delete pod -l app.kubernetes.io/name=ghe-controller
 }
 
 run_e2e_tests() {
-	bitbucket_cloud_token="${1}"
-	webhook_secret="${2}"
-	test_gitea_smeeurl="${3}"
-	installation_id="${4}"
-	gh_apps_token="${5}"
-	test_github_second_token="${6}"
-	gitlab_token="${7}"
-
-	# Nothing specific to webhook here it  just that repo is private in that org and that's what we want to test
-	export TEST_GITHUB_PRIVATE_TASK_URL="https://github.com/openshift-pipelines/pipelines-as-code-e2e-tests-private/blob/main/remote_task.yaml"
-	export TEST_GITHUB_PRIVATE_TASK_NAME="task-remote"
-
-	export GO_TEST_FLAGS="-v -race -failfast"
-
-	export TEST_BITBUCKET_CLOUD_API_URL=https://api.bitbucket.org/2.0
-	export TEST_BITBUCKET_CLOUD_E2E_REPOSITORY=cboudjna/pac-e2e-tests
-	export TEST_BITBUCKET_CLOUD_TOKEN=${bitbucket_cloud_token}
-	export TEST_BITBUCKET_CLOUD_USER=cboudjna
-
-	export TEST_EL_URL="http://${CONTROLLER_DOMAIN_URL}"
-	export TEST_EL_WEBHOOK_SECRET="${webhook_secret}"
-
-	export TEST_GITEA_API_URL="http://localhost:3000"
-	## This is the URL used to forward requests from the webhook to the paac controller
-	## badly named!
-	export TEST_GITEA_SMEEURL="${test_gitea_smeeurl}"
-	export TEST_GITEA_USERNAME=pac
-	export TEST_GITEA_PASSWORD=pac
-	export TEST_GITEA_REPO_OWNER=pac/pac
-
-	export TEST_GITHUB_API_URL=api.github.com
-	export TEST_GITHUB_REPO_INSTALLATION_ID="${installation_id}"
-	export TEST_GITHUB_REPO_OWNER_GITHUBAPP=openshift-pipelines/pipelines-as-code-e2e-tests
-	export TEST_GITHUB_REPO_OWNER_WEBHOOK=openshift-pipelines/pipelines-as-code-e2e-tests-webhook
-	export TEST_GITHUB_TOKEN="${gh_apps_token}"
-
-	export TEST_GITHUB_SECOND_API_URL=ghe.pipelinesascode.com
-	export TEST_GITHUB_SECOND_EL_URL=http://ghe.paac-127-0-0-1.nip.io
-	export TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP=pipelines-as-code/e2e
-	# TODO: webhook repo for second github
-	# export TEST_GITHUB_SECOND_REPO_OWNER_WEBHOOK=openshift-pipelines/pipelines-as-code-e2e-tests-webhook
-	export TEST_GITHUB_SECOND_REPO_INSTALLATION_ID=1
-	export TEST_GITHUB_SECOND_TOKEN="${test_github_second_token}"
-
-	export TEST_GITLAB_API_URL="https://gitlab.com"
-	export TEST_GITLAB_PROJECT_ID="34405323"
-	export TEST_GITLAB_TOKEN=${gitlab_token}
-	# https://gitlab.com/gitlab-com/alliances/ibm-red-hat/sandbox/openshift-pipelines/pac-e2e-tests
-	make test-e2e
+  bitbucket_cloud_token="${1}"
+  webhook_secret="${2}"
+  test_gitea_smeeurl="${3}"
+  installation_id="${4}"
+  gh_apps_token="${5}"
+  test_github_second_token="${6}"
+  gitlab_token="${7}"
+
+  # Nothing specific to webhook here it  just that repo is private in that org and that's what we want to test
+  export TEST_GITHUB_PRIVATE_TASK_URL="https://github.com/openshift-pipelines/pipelines-as-code-e2e-tests-private/blob/main/remote_task.yaml"
+  export TEST_GITHUB_PRIVATE_TASK_NAME="task-remote"
+
+  export GO_TEST_FLAGS="-v -race -failfast"
+
+  export TEST_BITBUCKET_CLOUD_API_URL=https://api.bitbucket.org/2.0
+  export TEST_BITBUCKET_CLOUD_E2E_REPOSITORY=cboudjna/pac-e2e-tests
+  export TEST_BITBUCKET_CLOUD_TOKEN=${bitbucket_cloud_token}
+  export TEST_BITBUCKET_CLOUD_USER=cboudjna
+
+  export TEST_EL_URL="http://${CONTROLLER_DOMAIN_URL}"
+  export TEST_EL_WEBHOOK_SECRET="${webhook_secret}"
+
+  export TEST_GITEA_API_URL="http://localhost:3000"
+  ## This is the URL used to forward requests from the webhook to the paac controller
+  ## badly named!
+  export TEST_GITEA_SMEEURL="${test_gitea_smeeurl}"
+  export TEST_GITEA_USERNAME=pac
+  export TEST_GITEA_PASSWORD=pac
+  export TEST_GITEA_REPO_OWNER=pac/pac
+
+  export TEST_GITHUB_API_URL=api.github.com
+  export TEST_GITHUB_REPO_INSTALLATION_ID="${installation_id}"
+  export TEST_GITHUB_REPO_OWNER_GITHUBAPP=openshift-pipelines/pipelines-as-code-e2e-tests
+  export TEST_GITHUB_REPO_OWNER_WEBHOOK=openshift-pipelines/pipelines-as-code-e2e-tests-webhook
+  export TEST_GITHUB_TOKEN="${gh_apps_token}"
+
+  export TEST_GITHUB_SECOND_API_URL=ghe.pipelinesascode.com
+  export TEST_GITHUB_SECOND_EL_URL=http://ghe.paac-127-0-0-1.nip.io
+  export TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP=pipelines-as-code/e2e
+  # TODO: webhook repo for second github
+  # export TEST_GITHUB_SECOND_REPO_OWNER_WEBHOOK=openshift-pipelines/pipelines-as-code-e2e-tests-webhook
+  export TEST_GITHUB_SECOND_REPO_INSTALLATION_ID=1
+  export TEST_GITHUB_SECOND_TOKEN="${test_github_second_token}"
+
+  export TEST_GITLAB_API_URL="https://gitlab.com"
+  export TEST_GITLAB_PROJECT_ID="34405323"
+  export TEST_GITLAB_TOKEN=${gitlab_token}
+  # https://gitlab.com/gitlab-com/alliances/ibm-red-hat/sandbox/openshift-pipelines/pac-e2e-tests
+  make test-e2e
 }
 
 collect_logs() {
-	mkdir -p /tmp/logs
-	kind export logs /tmp/logs
-	[[ -d /tmp/gosmee-replay ]] && cp -a /tmp/gosmee-replay /tmp/logs/
-
-	kubectl get pipelineruns -A -o yaml >/tmp/logs/pac-pipelineruns.yaml
-	kubectl get repositories.pipelinesascode.tekton.dev -A -o yaml >/tmp/logs/pac-repositories.yaml
-	kubectl get configmap -n pipelines-as-code -o yaml >/tmp/logs/pac-configmap
-	kubectl get events -A >/tmp/logs/events
-
-	allNamespaces=$(kubectl get namespaces -o jsonpath='{.items[*].metadata.name}')
-	for ns in ${allNamespaces}; do
-		mkdir -p /tmp/logs/ns/${ns}
-		for type in pods pipelineruns repositories configmap; do
-			kubectl get ${type} -n ${ns} -o yaml >/tmp/logs/ns/${ns}/${type}.yaml
-		done
-		kubectl -n ${ns} get events >/tmp/logs/ns/${ns}/events
-	done
+  mkdir -p /tmp/logs
+  kind export logs /tmp/logs
+  [[ -d /tmp/gosmee-replay ]] && cp -a /tmp/gosmee-replay /tmp/logs/
+
+  kubectl get pipelineruns -A -o yaml >/tmp/logs/pac-pipelineruns.yaml
+  kubectl get repositories.pipelinesascode.tekton.dev -A -o yaml >/tmp/logs/pac-repositories.yaml
+  kubectl get configmap -n pipelines-as-code -o yaml >/tmp/logs/pac-configmap
+  kubectl get events -A >/tmp/logs/events
+
+  allNamespaces=$(kubectl get namespaces -o jsonpath='{.items[*].metadata.name}')
+  for ns in ${allNamespaces}; do
+    mkdir -p /tmp/logs/ns/${ns}
+    for type in pods pipelineruns repositories configmap; do
+      kubectl get ${type} -n ${ns} -o yaml >/tmp/logs/ns/${ns}/${type}.yaml
+    done
+    kubectl -n ${ns} get events >/tmp/logs/ns/${ns}/events
+  done
 }
 
 help() {
-	cat <<EOF
+  cat <<EOF
   Usage: $0 <command> [args]
 
   Shell script to run e2e tests from GitHub Actions CI
@@ -150,24 +157,24 @@ EOF
 
 case ${1-""} in
 create_pac_github_app_secret)
-	create_pac_github_app_secret "${2}" "${3}" "${4}"
-	;;
+  create_pac_github_app_secret "${2}" "${3}" "${4}"
+  ;;
 create_second_github_app_controller_on_ghe)
-	create_second_github_app_controller_on_ghe "${2}" "${3}" "${4}"
-	;;
+  create_second_github_app_controller_on_ghe "${2}" "${3}" "${4}"
+  ;;
 run_e2e_tests)
-	run_e2e_tests "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}"
-	;;
+  run_e2e_tests "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}"
+  ;;
 collect_logs)
-	collect_logs
-	;;
+  collect_logs
+  ;;
 help)
-	help
-	exit 0
-	;;
+  help
+  exit 0
+  ;;
 *)
-	echo "Unknown command ${1-}"
-	help
-	exit 1
-	;;
+  echo "Unknown command ${1-}"
+  help
+  exit 1
+  ;;
 esac