Skip to content

Use standard buildah-oci-ta #2156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 9, 2024
Merged

Use standard buildah-oci-ta #2156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4683e58
Enable Tekton alpha features
rnc Oct 7, 2024
cbc2848
Move task definitions to systemconfig and update to use main branch
rnc Oct 7, 2024
ca560ae
Use a computeresources for the pipeline.
rnc Oct 8, 2024
b9c1bce
Remove buildah-oci-ta task
rnc Oct 9, 2024
b750036
Only apply PodTemplate and ComputeResources for CI Tests
rnc Oct 9, 2024
bac0bca
Use kubectl rather than oc
rnc Oct 9, 2024
7629329
Add missing annotation. Add logging.
rnc Oct 9, 2024
1dc70f3
Use Ubuntu 22.04 rather than latest which is now 24
rnc Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/minikube.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches: [ main ]
jobs:
wait-for-images:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
Copy link
Collaborator Author

@rnc rnc Oct 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Solves the problems with minikube / oc due to https://www.github.com/actions/runner-images/issues/10636

steps:
- name: Wait for Images
run: |
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions deploy/minikube-development.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/openshift-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions deploy/openshift-development.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading