Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
shawn-hurley committed Jul 26, 2024
1 parent 08f7ea0 commit 921273f
Showing 1 changed file with 20 additions and 15 deletions.
35 changes: 20 additions & 15 deletions .github/workflows/demo-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Demo Testing
on: ["push", "pull_request"]

env:
IMG_JAVA_PROVIDER: ttl.sh/konveyor-java-external-provider:2hr
IMG_JAVA_PROVIDER: ttl.sh/konveyor-java-external-provider:2h
IMG_DOTNET_PROVIDER: ttl.sh/konveyor-dotnet-external-provider:2h
IMG_GENERIC_PROVIDER: ttl.sh/konveyor-generic-external-provider:2h

Expand Down Expand Up @@ -74,28 +74,32 @@ jobs:
build-external
podman build -t quay.io/konveyor/analyzer-lsp:latest -f Dockerfile .
# run the demo in a podman pod
#run the demo in a podman pod
- name: run demo image
run : |
make \
IMG_JAVA_PROVIDER=$IMG_JAVA_PROVIDER \
IMG_DOTNET_PROVIDER=$IMG_DOTNET_PROVIDER \
IMG_GENERIC_PROVIDER=$IMG_GENERIC_PROVIDER \
run-external-providers-pod
podman build -f demo-local.Dockerfile -t localhost/testing:latest
make run-demo-image
# podman build -f demo-local.Dockerfile -t localhost/testing:latest


# make run-demo-image

- name: install yq for testing
run: go install github.com/mikefarah/yq/v4@latest
# - name: install yq for testing
# run: go install github.com/mikefarah/yq/v4@latest

- name: ensure violation and dependency outputs are unchanged
run: |
diff \
<(yq -P 'sort_keys(..)' -o=props <(git show HEAD:demo-output.yaml)) \
<(yq -P 'sort_keys(..)' -o=props <(cat demo-output.yaml))
diff \
<(yq -P 'sort_keys(..)' -o=props <(git show HEAD:demo-dep-output.yaml)) \
<(yq -P 'sort_keys(..)' -o=props <(cat demo-dep-output.yaml))
# - name: ensure violation and dependency outputs are unchanged
# run: |
# diff \
# <(yq -P 'sort_keys(..)' -o=props <(git show HEAD:demo-output.yaml)) \
# <(yq -P 'sort_keys(..)' -o=props <(cat demo-output.yaml))
# diff \
# <(yq -P 'sort_keys(..)' -o=props <(git show HEAD:demo-dep-output.yaml)) \
# <(yq -P 'sort_keys(..)' -o=props <(cat demo-dep-output.yaml))

- uses: actions/checkout@v3
with:
Expand All @@ -120,9 +124,10 @@ jobs:
addon_analyzer: ttl.sh/konveyor-tackle2-addon-analyzer:2h
provider_generic: ${{ env.IMG_GENERIC_PROVIDER }}
provider_java: ${{ env.IMG_JAVA_PROVIDER}}

- name: push bundle image
run: |
podman push ttl.sh/konveyor-operator-bundle-shawn-test:2h
docker push ttl.sh/konveyor-operator-bundle-shawn-test:2h
e2e:
needs: test
uses: konveyor/ci/.github/workflows/global-ci-bundle.yml@main
Expand Down

0 comments on commit 921273f

Please sign in to comment.