Skip to content
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.

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

Provide an ISO 15118-2 AC plus OCPP 1.6J demo #7

Merged
merged 13 commits into from
Dec 7, 2023

Conversation

drmrd
Copy link
Contributor

@drmrd drmrd commented Nov 20, 2023

These changes include the addition of a new SteVe-based OCPP 1.6J demo that can be executed as a one-liner. Updates to the existing SteVe images (such as the one in the everest-utils repository) were made to obtain a SteVe server that operates well on macOS, Linux, and Windows.

Unfortunately, the build process for the SteVe image is not fully automated at this time. Fully automating it requires disabling or tracking CSRF tokens produced by the SteVe server.

The good news is that the build process is straightforward, with its only manual steps being configuring a charge point and several OCPP ID tags within SteVe before calling docker commit for the SteVe and OCPP DB containers. Instructions for the build process are captured in steve/README.md.

@drmrd
Copy link
Contributor Author

drmrd commented Nov 20, 2023

Requesting a review from @shankari

@drmrd
Copy link
Contributor Author

drmrd commented Nov 21, 2023

One note: This demo only works with manager images that include the changes from EVerest/everest-core#388. For instance, the version of everest-core pinned in the manager image in #8 is compatible with the OCPP 1.6J demo.

@drmrd drmrd mentioned this pull request Dec 2, 2023
3 tasks
@drmrd drmrd force-pushed the ocpp16j-demo branch 2 times, most recently from 3752f60 to f69f957 Compare December 6, 2023 19:48
@drmrd
Copy link
Contributor Author

drmrd commented Dec 6, 2023

@shankari: This PR should be ready to merge after the following:

  • SteVe and OCPP-DB images are created in the EVerest organization. I've built and pushed two images to the US-JOET org that you can re-label and push here:
    • ghcr.io/us-joet/everest-demo/steve-configured:0.0.1 changed to ghcr.io/everest/everest-demo/steve-configured:0.0.1 and
    • ghcr.io/us-joet/everest-demo/ocpp-db-compiled:0.0.1 changed to ghcr.io/everest/everest-demo/ocpp-db-compiled:0.0.1
  • changes from Impose resource constraints on demos #6 are incorporated into this branch
    • I'm happy to do this once we're otherwise ready to merge.

@drmrd drmrd marked this pull request as ready for review December 6, 2023 21:06
@shankari
Copy link
Collaborator

shankari commented Dec 7, 2023

I don't have create_package permissions

6041800a8d9d: Mounted from us-joet/everest-demo/steve-configured
denied: permission_denied: create_package

@hikinggrass @caller can one of you pull + push, or give me the appropriate permissions so that we can push these manually created images?

Here are the instructions:

$ docker login ghcr.io --username <username>
$ docker pull ghcr.io/us-joet/everest-demo/steve-configured:0.0.1
$ docker tag ghcr.io/us-joet/everest-demo/steve-configured:0.0.1 ghcr.io/everest/everest-demo/steve-configured:0.0.1
$ docker push ghcr.io/everest/everest-demo/steve-configured:0.0.1

@shankari
Copy link
Collaborator

shankari commented Dec 7, 2023

@drmrd since OCPP 1.6J integration will be deprecated soon anyway, and we are not rebuilding the images automatically,
I would suggest using the steve images (pre-built, docker committed) directly from US-JOET, and only use the everest containers (manager etc) from everest.

Once we have true end-to-end automated testing (including EV <-> EVSE <-> CSMS), we can include it as part of the smoke tests and know when to update the steve images (if necessary).

@shankari
Copy link
Collaborator

shankari commented Dec 7, 2023

Merging, excited to finally see the end to end test working!

@shankari shankari merged commit 5b1c5b5 into EVerest:main Dec 7, 2023
4 checks passed
@shankari
Copy link
Collaborator

shankari commented Dec 7, 2023

oh wait, I missed the

changes from #6 are incorporated into this branch
I'm happy to do this once we're otherwise ready to merge.

@drmrd when you are updating #6, you can apply the same changes to this docker-compose as well 😄

shankari added a commit that referenced this pull request Nov 15, 2024
* 👷Initial workflow to checkout and build the CSMS

This can definitely be polished, but it works now so can unblock
#78

Changes:
- Add a new workflow
- Configure it with a hardcoded set of images to build for maeve
- Apply compile-time patches
- Build and push, similar to the original `cicd` workflow

----- full list of changes -----

* Build on pull requests to upgrade branches as well

* Handle the two directories correctly

Need to explicitly `cd` into `everest-demo`
And apply patches from there

* Fix repo format

* Fix checked out directory format

* Again change directory properly before building

* Now that build works, re-tag and push

* Fix invalid workflow format

* Really fix the format

* read the env properly (from within the demo)

* Login before pushing

* Switch to the build-push-action so that push to packages works

#78 (comment)

* Actually push the values

* Give more permissions to the token

To be consistent with
https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions

* Change the permission to "admin"

So that we can really really push?!

* Temporarily switch to US-JOET so we can verify that it works

* Split the maeve patches into compile time and runtime

And apply only the compile time patch while building the image

Signed-off-by: Shankari <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants