Merge pull request #2156 from rnc/RESOURCES

Use standard buildah-oci-ta

Author: rnc

.github/workflows/minikube.yaml

@@ -4,7 +4,7 @@ on:
     branches: [ main ]
 jobs:
   wait-for-images:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Wait for Images
         run: |
@@ -36,7 +36,7 @@ jobs:
           - "build-systems"
           - "commons"
     needs: [wait-for-images]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Minikube Artifact Build Matrix
     steps:
       - name: Free Disk Space (Ubuntu)
@@ -99,7 +99,7 @@ jobs:
         dbtestsets:
           - "jakartaee"
     needs: [wait-for-images]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Minikube Dependency Build Matrix
     steps:
       - name: Free Disk Space (Ubuntu)

deploy/minikube-development.sh

@@ -6,20 +6,21 @@ timeout=600 #10 minutes in seconds
 endTime=$(( $(date +%s) + timeout ))
 
 echo -e "\033[0;32mWaiting for Tekton Pipeines to start...\033[0m"
-while ! oc get pods -n tekton-pipelines | grep tekton-pipelines-controller | grep "1/1"; do
+while ! kubectl get pods -n tekton-pipelines | grep tekton-pipelines-controller | grep "1/1"; do
     sleep 1
     if [ $(date +%s) -gt $endTime ]; then
         exit 1
     fi
 done
-while ! oc get pods -n tekton-pipelines | grep tekton-pipelines-webhook | grep "1/1"; do
+while ! kubectl get pods -n tekton-pipelines | grep tekton-pipelines-webhook | grep "1/1"; do
     sleep 1
     if [ $(date +%s) -gt $endTime ]; then
         exit 1
     fi
 done
 #we need to make sure the tekton webhook has its rules installed
 kubectl wait --for=jsonpath='{.webhooks[0].rules}' --timeout=300s mutatingwebhookconfigurations.admissionregistration.k8s.io webhook.pipeline.tekton.dev
+kubectl patch cm feature-flags -n tekton-pipelines -p '{"data":{"enable-api-fields":"alpha"}}'
 echo -e "\033[0;32mTekton controller is running\033[0m"
 
 #CRDS are sometimes racey

deploy/openshift-ci.sh

@@ -30,6 +30,7 @@ oc apply -f ${DIR}/base/pipelines/openshift-pipelines-subscription.yaml
 waitFor "oc get ns openshift-pipelines"
 waitFor "oc get pods -n openshift-pipelines | grep tekton-pipelines-controller | grep Running"
 waitFor "oc get mutatingwebhookconfigurations.admissionregistration.k8s.io webhook.pipeline.tekton.dev -o yaml | grep rules"
+oc patch tektonconfigs.operator.tekton.dev config --type=merge -p '{"spec":{"pipeline":{"enable-api-fields":"alpha"}}}'
 echo "Tekton controller is running"
 
 oc create ns jvm-build-service || true

deploy/openshift-development.sh

@@ -21,6 +21,8 @@ fi
 DIR=`dirname $0`
 $DIR/base-development.sh $1
 
+kubectl patch tektonconfigs.operator.tekton.dev config --type=merge -p '{"spec":{"pipeline":{"enable-api-fields":"alpha"}}}'
+
 if [ "$deploy_maven_repo" = true ]; then
     export REPOSILITE_IMAGE=$(sed -n 's/^FROM //p' $DIR/../openshift-with-appstudio-test/e2e/Dockerfile.reposilite)
     kubectl delete -f $DIR/maven-repo.yaml --ignore-not-found