Skip to content

Commit

Permalink
Merge release/k900-xil branch into master (#147)
Browse files Browse the repository at this point in the history
<!-- Thanks for the contribution, this is awesome. -->
This PR is to merge release branch k900-xil into master for xil release
4.4.3
# PR Details
## Description

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document.
[CARMA Contributing Guide](Contributing.md) 
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
  • Loading branch information
codygarver authored Jun 20, 2023
2 parents ba924f5 + 0861bed commit b551857
Show file tree
Hide file tree
Showing 119 changed files with 14,973 additions and 4,662 deletions.
96 changes: 0 additions & 96 deletions .circleci/config.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: "CI: Run tests"
on:
pull_request:
push:
jobs:
sonar: # sonar job is to setup and run sonar scan analysis on telematic cloud messaging code
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3 # The setup-java action provides the functionality for GitHub Actions runners for Downloading and setting up a requested version of Java
with:
java-version: 11
distribution: "temurin"
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
cd co-simulation
mvn -e -X clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dlicense.skip -Dmaven.test.failure.ignore=false -Pcoverage jacoco:report -Dsonar.projectKey=usdot-fhwa-stol_carma-simulation -Dsonar.projectName=carma-simulation -Dsonar.organization=usdot-fhwa-stol -Dsonar.host.url=https://sonarcloud.io
13 changes: 13 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Docker build

on:
push:
branches-ignore:
- "develop"
- "release/*"
pull_request:
types: [opened, synchronize, reopened]

jobs:
docker:
uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CARLA_*.tar.gz
.idea/
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,15 @@ ARG VCS_REF
ARG BUILD_DATE

LABEL org.label-schema.schema-version="1.0"
LABEL org.label-schema.name="carma-simulation"
LABEL org.label-schema.name="cdasim"
LABEL org.label-schema.description="XIL Simulation environment for evaluation and testing of the CARMA Platform"
LABEL org.label-schema.vendor="Leidos"
LABEL org.label-schema.version=${VERSION}
LABEL org.label-schema.url="https://highways.dot.gov/research/research-programs/operations/CARMA"
LABEL org.label-schema.vcs-url="https://github.com/usdot-fhwa-stol/carma-simulation/"
LABEL org.label-schema.vcs-url="https://github.com/usdot-fhwa-stol/cdasim/"
LABEL org.label-schema.vcs-ref=${VCS_REF}
LABEL org.label-schema.build-date=${BUILD_DATE}

ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
RUN export JAVA_HOME

# Env vars for the nvidia-container-runtime.
ENV NVIDIA_VISIBLE_DEVICES all
Expand All @@ -44,6 +42,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES graphics,utility,compute
RUN adduser $SUMO_USER --disabled-password

# Enable sudo
RUN sed -i 's|http://archive.ubuntu.com|http://us.archive.ubuntu.com|g' /etc/apt/sources.list
RUN apt-get update && apt-get install -y sudo
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
RUN adduser $SUMO_USER sudo --disabled-password
Expand All @@ -55,4 +54,4 @@ COPY --chown=carma:carma docker/env.sh /home/carma/.base-image/
RUN docker/install.sh

ENTRYPOINT [ "/home/carma/src/docker/entrypoint.sh" ]
CMD [ "mosaic.sh", "-s", "HelloWorld" ]
CMD [ "mosaic.sh", "-s", "Tiergarten" ]
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
| CI Build Status | Docker Build | Docker Hub Push | Sonar Code Quality |
|----------------------|---------------------|---------------------|---------------------|
|[![CI](https://github.com/usdot-fhwa-stol/carma-simulation/actions/workflows/ci.yml/badge.svg)](https://github.com/usdot-fhwa-stol/carma-simulation/actions/workflows/ci.yml) | [![Docker](https://github.com/usdot-fhwa-stol/carma-simulation/actions/workflows/docker.yml/badge.svg)](https://github.com/usdot-fhwa-stol/carma-simulation/actions/workflows/docker.yml) | [![Docker Hub](https://github.com/usdot-fhwa-stol/carma-simulation/actions/workflows/dockerhub.yml/badge.svg)](https://github.com/usdot-fhwa-stol/carma-simulation/actions/workflows/dockerhub.yml) | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=usdot-fhwa-stol_carma-simulation&metric=alert_status)](https://sonarcloud.io/dashboard?id=usdot-fhwa-stol_carma-simulation)|
# CARMASimulation
This repository will host the CARMA Everything-in-the-Loop Co-Simulation tool. This XiL simulation platform will support CARLA and SUMO simulation environments as a co-simulation using the MOSAIC framework to facilitate coordination and data exchange. This co-simulation environment will also utilize NS-3 to simulate the communications used by the C-ADS systems.

Expand Down
66 changes: 65 additions & 1 deletion co-simulation/NOTICE-THIRD-PARTY.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ Apache Commons CLI (1.4)
* Source: https://svn.apache.org/viewvc/commons/proper/cli/trunk/


Apache Commons Codec (1.15)

* License: Apache License, Version 2.0
* Maven artifact: `commons-codec:commons-codec:1.15`
* Project: https://commons.apache.org/proper/commons-codec/
* Source: https://github.com/apache/commons-codec


Apache Commons Configuration (2.5)

* License: Apache License, Version 2.0
Expand Down Expand Up @@ -77,6 +85,22 @@ Commons JXPath (1.3)
* Source: https://svn.apache.org/repos/asf/commons/proper/jxpath/trunk


Extended StAX API (1.8.1)

* License: Eclipse Distribution License - v 1.0
* Maven artifact: `org.jvnet.staxex:stax-ex:1.8.1`
* Project: https://projects.eclipse.org/projects/ee4j/stax-ex
* Source: https://github.com/eclipse-ee4j/jaxb-stax-ex


fastinfoset (1.2.16)

* License: Apache License, Version 2.0, Eclipse Distribution License - v 1.0
* Maven artifact: `com.sun.xml.fastinfoset:FastInfoset:1.2.16`
* Project: https://projects.eclipse.org/projects/ee4j.jaxb-impl/FastInfoset
* Source: https://github.com/eclipse-ee4j/jaxb-fi/FastInfoset


Findbugs Annotations under Apache License (1.3.9-1)

* License: Apache License, Version 2.0
Expand Down Expand Up @@ -133,6 +157,14 @@ HPPC Collections (0.8.1)
* Source: https://github.com/carrotsearch/hppc/hppc


istack common utility code runtime (3.0.8)

* License: Eclipse Distribution License - v 1.0
* Maven artifact: `com.sun.istack:istack-commons-runtime:3.0.8`
* Project: https://projects.eclipse.org/projects/ee4j/istack-commons/istack-commons-runtime
* Source: https://github.com/eclipse-ee4j/jaxb-istack-commons/istack-commons-runtime


Jackson module: JAXB Annotations (2.9.9)

* License: The Apache Software License, Version 2.0
Expand Down Expand Up @@ -173,6 +205,14 @@ Jackson-dataformat-XML (2.9.9)
* Source: https://github.com/FasterXML/jackson-dataformat-xml


jakarta.xml.bind-api (2.3.2)

* License: Eclipse Distribution License - v 1.0
* Maven artifact: `jakarta.xml.bind:jakarta.xml.bind-api:2.3.2`
* Project: https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api
* Source: https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api


Janino (2.7.5)

* License: New BSD License
Expand All @@ -191,12 +231,20 @@ Java-WebSocket (1.3.9)

JavaBeans Activation Framework API jar (1.2.0)

* License: CDDL/GPLv2+CE
* License: CDDL/GPLv2+CE, EDL 1.0
* Maven artifact: `javax.activation:javax.activation-api:1.2.0`
* Project: http://java.net/all/javax.activation-api/
* Source: https://github.com/javaee/activation/javax.activation-api


JAXB Runtime (2.3.2)

* License: Eclipse Distribution License - v 1.0
* Maven artifact: `org.glassfish.jaxb:jaxb-runtime:2.3.2`
* Project: https://javaee.github.io/jaxb-v2/jaxb-runtime-parent/jaxb-runtime/
* Source: https://github.com/eclipse-ee4j/jaxb-ri/jaxb-runtime-parent/jaxb-runtime


jaxb-api (2.3.1)

* License: CDDL 1.1, GPL2 w/ CPE
Expand Down Expand Up @@ -245,6 +293,14 @@ Logback Core Module (1.2.3)
* Source: https://github.com/ceki/logback/logback-core


mosaic-carma-utils (22.1-SNAPSHOT)

* License: Eclipse Public License - v 2.0
* Maven artifact: `gov.dot.fhwa.saxton:mosaic-carma-utils:22.1-SNAPSHOT`
* Project: not available
* Source: https://github.com/eclipse/mosaic/lib/mosaic-carma-utils


org.leadpony.justify (1.1.0)

* License: The Apache Software License, Version 2.0
Expand Down Expand Up @@ -285,6 +341,14 @@ Stax2 API (3.1.4)
* Source: https://github.com/FasterXML/stax2-api


TXW2 Runtime (2.3.2)

* License: Eclipse Distribution License - v 1.0
* Maven artifact: `org.glassfish.jaxb:txw2:2.3.2`
* Project: https://javaee.github.io/jaxb-v2/jaxb-txw-parent/txw2/
* Source: https://github.com/eclipse-ee4j/jaxb-ri/jaxb-txw-parent/txw2


Woodstox (5.1.0)

* License: The Apache License, Version 2.0
Expand Down
Loading

0 comments on commit b551857

Please sign in to comment.