Skip to content

OpenShift CI: Download latest odo rather than building from main #97

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 4 commits into from
Feb 28, 2022
Merged

OpenShift CI: Download latest odo rather than building from main #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b58fe1e
Use latest odo from Red Hat Developer
johnmcollier Feb 28, 2022
32267fa
Remove comment
johnmcollier Feb 28, 2022
a86971f
Update download link
johnmcollier Feb 28, 2022
bdc9129
Update python starter projects
johnmcollier Feb 28, 2022
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
13 changes: 5 additions & 8 deletions .ci/openshift_integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,8 @@ oc new-project devfile-registry-test
curl -sL https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linux_amd64 -o yq && chmod +x yq
YQ_PATH=$(realpath yq)

# Build odo
git clone https://github.com/openshift/odo.git
cd odo && make
cd ..

# Download odo
curl -sL https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest/odo-linux-amd64 -o odo && chmod +x odo
export GLOBALODOCONFIG=$(pwd)/preferences.yaml

# Install the devfile registry
Expand All @@ -55,8 +52,8 @@ REGISTRY_HOSTNAME=$(oc get route devfile-registry -o jsonpath="{.spec.host}")
echo $REGISTRY_HOSTNAME

# Delete the default devfile registry and add the test one we just stood up
$(realpath odo/odo) registry delete DefaultDevfileRegistry -f
$(realpath odo/odo) registry add TestDevfileRegistry http://$REGISTRY_HOSTNAME
$(realpath odo) registry delete DefaultDevfileRegistry -f
$(realpath odo) registry add TestDevfileRegistry http://$REGISTRY_HOSTNAME

# Run the devfile validation tests
ENV=openshift REGISTRY=remote tests/test.sh $(realpath odo/odo) $YQ_PATH
ENV=openshift REGISTRY=remote tests/test.sh $(realpath odo) $YQ_PATH
2 changes: 1 addition & 1 deletion stacks/python-django/devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ starterProjects:
- name: django-example
git:
remotes:
origin: https://github.com/odo-devfiles/python-django-ex
origin: https://github.com/devfile-samples/python-django-ex
components:
- name: py-web
container:
Expand Down
2 changes: 1 addition & 1 deletion stacks/python/devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ starterProjects:
- name: python-example
git:
remotes:
origin: https://github.com/odo-devfiles/python-ex
origin: https://github.com/devfile-samples/python-ex
components:
- name: py-web
container:
Expand Down