Merge pull request #766 from nasa/develop

release 0.17.2

.github/workflows/ci_pr.yml

@@ -7,38 +7,6 @@ on:
 
 jobs:
 
-  build-xenial:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Checkout submodule
-      run: git submodule update --init --depth 1 description/media
-
-    - name: Build, test
-      run: ./scripts/docker/build.sh --xenial --remote
-                                     astrobee test_astrobee
-
-  build-bionic:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Checkout submodule
-      run: git submodule update --init --depth 1 description/media
-
-    - name: Build, test
-      run: ./scripts/docker/build.sh --bionic --remote
-                                     astrobee test_astrobee
-
   build-focal:
 
     runs-on: ubuntu-20.04

.github/workflows/ci_push.yml

@@ -2,46 +2,12 @@ name: Build, test and push packages CI
 
 on:
   push:
-    branches: [ 'develop' ]
+    branches-ignore:
+      - gh-pages
+      - ros2
 
 jobs:
 
-  build-xenial:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Checkout submodule
-      run: git submodule update --init --depth 1 description/media
-
-    - name: Log in to registry
-      run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-
-    - name: Build, test, push docker
-      run: ./scripts/docker/build.sh --xenial --remote
-                                     --owner ${{ github.repository_owner }}
-                                     astrobee test_astrobee push_astrobee
-
-  build-bionic:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Checkout submodule
-      run: git submodule update --init --depth 1 description/media
-
-    - name: Log in to registry
-      run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-
-    - name: Build, test, push docker
-      run: ./scripts/docker/build.sh --bionic --remote
-                                     --owner ${{ github.repository_owner }}
-                                     astrobee test_astrobee push_astrobee
-
   build-focal:
 
     runs-on: ubuntu-20.04
@@ -56,6 +22,24 @@ jobs:
       run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
 
     - name: Build, test, push docker
-      run: ./scripts/docker/build.sh --focal --remote
-                                     --owner ${{ github.repository_owner }}
-                                     astrobee test_astrobee push_astrobee
+      run: >
+        revision="latest";
+        build_arg="astrobee";
+        push_arg="";
+        branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}};
+        if [ "${{ github.repository_owner }}" == "nasa" ]; then
+          if [ $branch == "develop" ]; then
+            push_arg="push_astrobee";
+          fi;
+          if [ $branch == "master" ]; then
+            export VERSION=`grep -w -m 1 "Release" RELEASE.md | awk '{print $3}'`;
+            revision="v${VERSION}";
+            build_arg="astrobee_base astrobee";
+            push_arg="push_astrobee_base push_astrobee";
+          fi;
+        fi;
+        command="./scripts/docker/build.sh --focal --remote --revision ${revision} \
+                                     --owner ${{ github.repository_owner }} \
+                                     ${build_arg} test_astrobee ${push_arg}";
+        echo "$command";
+        eval "$command";

.github/workflows/docker_push_latest_base.yml

@@ -8,42 +8,6 @@ on: ['workflow_dispatch']
 
 jobs:
 
-  build-xenial:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Checkout submodule
-      run: git submodule update --init --depth 1 description/media
-
-    - name: Log in to registry
-      run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-
-    - name: Build base, build, test, push base docker
-      run: ./scripts/docker/build.sh --xenial
-                                     --owner ${{ github.repository_owner }}
-                                     astrobee_base astrobee test_astrobee push_astrobee_base
-
-  build-bionic:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Checkout submodule
-      run: git submodule update --init --depth 1 description/media
-
-    - name: Log in to registry
-      run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-
-    - name: Build base, build, test, push base docker
-      run: ./scripts/docker/build.sh --bionic
-                                     --owner ${{ github.repository_owner }}
-                                     astrobee_base astrobee test_astrobee push_astrobee_base
-
   build-focal:
 
     runs-on: ubuntu-20.04

.github/workflows/msgs_jar.yaml

@@ -0,0 +1,57 @@
+# Check for lint error and auto correct them
+
+name: Build jar messages
+
+on: ['push', 'pull_request']
+
+jobs:
+  build-jar-msgs:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Build image astrobee/astrobee:msgs-ubuntu16.04
+      run: docker build . -f ./scripts/docker/astrobee_msgs.Dockerfile
+                                 --build-arg UBUNTU_VERSION=16.04
+                                 --build-arg ROS_VERSION=kinetic
+                                 --build-arg PYTHON=''
+                                 -t astrobee/astrobee:msgs-ubuntu16.04
+
+    - name: Build image astrobee/astrobee:latest-msgs-jar-ubuntu16.04
+      run: docker build . -f ./scripts/docker/build_msgs_jar.Dockerfile
+                              --build-arg UBUNTU_VERSION=16.04
+                              --build-arg ROS_VERSION=kinetic
+                              --build-arg PYTHON=''
+                              --build-arg REPO=astrobee
+                              -t ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar
+
+    - name: Copy jar files
+      run: |
+        docker cp $(docker create --rm ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar):/src/msgs/devel/share/maven/ .
+        find maven -name *.jar
+    
+    - name: Upload .jar messages artifact
+      if: ${{ github.event_name == 'push' }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: jar-msgs
+        path: maven/**/*.jar
+
+    - name: Log in to registry
+      run: |
+        echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
+
+    - name: Push Docker image if master or develop
+      run: >
+        branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}};
+        if [[ "${{ github.repository_owner }}" == "nasa" ]]; then
+          if [[ $branch == "develop" ]]; then 
+            docker push ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar;
+          fi;
+          if [[ $branch == "master" ]]; then
+            export VERSION=`grep -w -m 1 "Release" RELEASE.md | awk '{print $3}'`;
+            docker tag ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar ghcr.io/${{ github.repository_owner }}/astrobee:v${VERSION}-msgs-jar
+            docker push ghcr.io/${{ github.repository_owner }}/astrobee:v${VERSION}-msgs-jar;
+          fi;
+        fi;

INSTALL.md

@@ -2,13 +2,15 @@
 
 ## System requirements
 
-Ubuntu 20.04 is the preferred host OS for most Astrobee developers to use.
+Ubuntu 20.04 is currently the only supported platform for most Astrobee development use cases.
 
-Here are the available host OS options with development roadmap details (use 64-bit PC (AMD64) desktop image):
-- [Ubuntu 20.04](http://releases.ubuntu.com/20.04): This is the preferred host OS for most Astrobee developers to use. The Astrobee Facility team is currently preparing to upgrade the robots on ISS from Ubuntu 16.04 to Ubuntu 20.04, but we aren't yet ready to announce a deployment date for that upgrade.
-- [Ubuntu 18.04](http://releases.ubuntu.com/18.04): We are not aware of any current robot users that still need Ubuntu 18.04 support, and expect to discontinue support in the near future. New users should not select this host OS.
-- [Ubuntu 16.04](http://releases.ubuntu.com/16.04): The Astrobee robot hardware on ISS currently runs Ubuntu 16.04. Only developers with NASA internal access can cross-compile software to run on the robot, and must use 16.04 for that. Most developers shouldn't need to work with 16.04, especially when just getting started. Support will eventually be discontinued after the robot hardware on ISS is upgraded to Ubuntu 20.04.
-(Ubuntu 22.04 not supported)
+Here are the currently available host OS options with development roadmap details (use 64-bit PC (AMD64) desktop image):
+- [Ubuntu 20.04](http://releases.ubuntu.com/20.04): This is currently the only supported platform for most Astrobee development use cases. The Astrobee hardware on ISS has been running Ubuntu 20.04 since it was upgraded during the "Crew-Minimal S14" activity on December 19, 2023.
+- [Ubuntu 16.04](http://releases.ubuntu.com/16.04): No longer supported for most use cases. The Astrobee robot hardware ran Ubuntu 16.04 from its launch in 2019 until it was upgraded to run Ubuntu 20.04. Ubuntu 16.04 support was discontinued for most use cases in February 2024. Ending Ubuntu 16.04 support removed important limitations. For example, going forward, Astrobee's software will no longer need to be backward-compatible with Python 2 and OpenCV 3. However, Ubuntu 16.04 is still required in a very limited role that most developers don't need to worry about. We use it to compile a JAR file binary artifact of Astrobee message definitions used by the [astrobee_android](https://github.com/nasa/astrobee_android) code hosted on Astrobee's High-Level Processor, which runs a legacy version of Android with `rosjava`, which was designed to communicate with the ROS Kinetic distribution. Compiling the JAR file requires the `ros-kinetic-rosjava` package that is only available for Ubuntu 16.04. (But most developers shouldn't need to generate this artifact.)
+
+Specifically not supported:
+- ~~[Ubuntu 18.04](http://releases.ubuntu.com/18.04)~~: Ubuntu 18.04 support as a software development platform was discontinued as of November 2023. (It was never supported on the robot hardware.)
+- ~~[Ubuntu 22.04](http://releases.ubuntu.com/22.04)~~: There is currently no plan for Ubuntu 22.04 support on the Astrobee roadmap. However, note that Astrobee ROS2 support, when it eventually becomes available, is currently expected to use the ROS2 Humble Hawksbill distribution that normally runs on 22.04, but backported to run on 20.04 (the last Ubuntu version supported by ROS1). This will facilitate migrating from ROS1 to ROS2 without requiring a simultaneous Ubuntu distribution upgrade.
 
 Graphical interfaces will perform best if your host OS is running natively (not in a virtual machine).
 

RELEASE.md

@@ -1,5 +1,11 @@
 # Releases
 
+# Release 0.17.2
+
+  * Adding Generic comms bridge
+  * Multiple bug fixes
+  * Ubuntu 20 only supported now
+
 # Release 0.17.1
 
   * Multiple bug fixes

astrobee.doxyfile

@@ -39,7 +39,7 @@ PROJECT_NAME           = "NASA Astrobee Robot Software"
 # control system is used.
 
 
-PROJECT_NUMBER         = 0.17.1
+PROJECT_NUMBER         = 0.17.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

astrobee/CMakeLists.txt

@@ -18,7 +18,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(astrobee)
 
-set(ASTROBEE_VERSION 0.17.1)
+set(ASTROBEE_VERSION 0.17.2)
 
 ## Compile as C++14, supported in ROS Kinetic and newer
 add_compile_options(-std=c++14)