diff --git a/.github/workflows/check-task-migration.yaml b/.github/workflows/check-task-migration.yaml index 6ca4107e8..f3a83397f 100644 --- a/.github/workflows/check-task-migration.yaml +++ b/.github/workflows/check-task-migration.yaml @@ -4,7 +4,7 @@ name: Check task migrations branches: [main] jobs: check: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -12,6 +12,16 @@ jobs: fetch-depth: 0 - name: Create k8s Kind Cluster uses: helm/kind-action@v1 + - name: Install command line tools + run: | + # TODO: install tkn, kubectl, yq + yq --version + kubectl version + # sudo apt-get install -y kubectl kustomize yq + # curl -L https://dl.k8s.io/v1.32.0/kubernetes-client-linux-amd64.tar.gz | \ + # sudo tar -xz --no-same-owner -C /usr/bin/ kubectl + curl -L https://github.com/tektoncd/cli/releases/download/v0.39.0/tkn_0.39.0_Linux_x86_64.tar.gz | \ + sudo tar -xz --no-same-owner -C /usr/bin/ tkn - name: Run check run: | # Require name main diff --git a/hack/validate-migration.sh b/hack/validate-migration.sh index ec43d14bf..e3f5bdda7 100755 --- a/hack/validate-migration.sh +++ b/hack/validate-migration.sh @@ -62,7 +62,7 @@ preprocess_pipelines() { done <<<"$pushed_pipelines" mkdir -p "${WORK_DIR}/pipelines/local" - oc kustomize --output "${WORK_DIR}/pipelines/local" pipelines/ + kubectl kustomize --output "${WORK_DIR}/pipelines/local" pipelines/ local -r names="${pl_names_in_config[*]}" read -r hexdigits _ < <(sha256sum "${BASH_SOURCE[0]}") @@ -216,7 +216,7 @@ check_version_match() { if is_normal_task "$task_dir" "$task_name" ; then task_version=$(yq "$label" "${task_dir}/${task_name}.yaml") elif is_kustomized_task "$task_dir" "$task_name"; then - task_version=$(oc kustomize "$task_dir" | yq "$label") + task_version=$(kubectl kustomize "$task_dir" | yq "$label") else exit 1 fi