Skip to content

Commit

Permalink
Merge pull request #1063 from SanjalKatiyar/update_ci_414
Browse files Browse the repository at this point in the history
update CI to ODF 4.14 release
  • Loading branch information
openshift-ci[bot] authored Oct 5, 2023
2 parents 4f5269c + 99e49fd commit f7eca45
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/frontend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
branches: [master]
pull_request:
branches: [master, release-4.13, release-4.13-compatibility]
branches: [master, release-4.14, release-4.14-compatibility]

jobs:
build-test:
Expand Down
25 changes: 23 additions & 2 deletions openshift-ci/odf-catalog-source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
icon:
base64data: ''
mediatype: ''
image: quay.io/rhceph-dev/ocs-registry:latest-stable-4.13.0
image: quay.io/rhceph-dev/ocs-registry:latest-stable-4.14.0
priority: 100
publisher: Red Hat
sourceType: grpc
Expand All @@ -42,8 +42,29 @@ metadata:
name: odf-operator
namespace: openshift-storage
spec:
channel: stable-4.13
channel: stable-4.14
installPlanApproval: Automatic
name: odf-operator
source: redhat-operators
sourceNamespace: openshift-marketplace
---
apiVersion: v1
kind: Pod
metadata:
name: rhceph-dev-icsp
namespace: openshift-storage
labels:
app: rhceph-dev-icsp
spec:
securityContext:
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
containers:
- name: rhceph-dev-icsp
image: quay.io/rhceph-dev/ocs-registry:latest-stable-4.14.0
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
10 changes: 10 additions & 0 deletions test-prow-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ until [ "$(oc -n openshift-marketplace get catalogsource -o=jsonpath="{.items[?(
done
EOF

echo "Waiting for Catalog image's pod to be running"
timeout 5m bash <<-'EOF'
until [ "$(oc get pod -n openshift-storage rhceph-dev-icsp -o=jsonpath="{.status.phase}")" == "Running" ]; do
sleep 1
done
EOF

echo "Creating ImageContentSourcePolicy rules needed for ODF"
oc exec -it --namespace openshift-storage rhceph-dev-icsp -- cat /icsp.yaml | oc apply -f -

# Enable console plugin for ODF-Console
export CONSOLE_CONFIG_NAME="cluster"
export ODF_PLUGIN_NAME="odf-console"
Expand Down

0 comments on commit f7eca45

Please sign in to comment.