Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions .github/workflows/build-cfs-multitarget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,20 @@ jobs:
tar cvf - -C ${inst} . | ${COMPRESSOR} > ${GITHUB_WORKSPACE}/${inst}-bin.tar.${SUFFIX}
done

- name: Build target images
run: make IMAGE_TYPE=ext4 ${{ inputs.config-name }}.image

- name: Archive target images
run: |
if cd $GITHUB_WORKSPACE/build-${{ inputs.config-name }}/deploy
then
find -maxdepth 1 -mindepth 1 -type d | while read dir
do
inst=$(basename ${dir})
tar cvf - -C ${inst} . | ${COMPRESSOR} > ${GITHUB_WORKSPACE}/${inst}-target-img.tar.${SUFFIX}
done
fi

#- name: Build target images
# run: make IMAGE_TYPE=ext4 ${{ inputs.config-name }}.image
#
#- name: Archive target images
# run: |
# if cd $GITHUB_WORKSPACE/build-${{ inputs.config-name }}/deploy
# then
# find -maxdepth 1 -mindepth 1 -type d | while read dir
# do
# inst=$(basename ${dir})
# tar cvf - -C ${inst} . | ${COMPRESSOR} > ${GITHUB_WORKSPACE}/${inst}-target-img.tar.${SUFFIX}
# done
# fi
#
- name: Upload all artifacts
uses: actions/upload-artifact@v7
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:

prep:
description: 'Make Prep'
default: make prep
default: 'make native_std.prep'
required: false
type: string

Expand All @@ -55,7 +55,7 @@ env:
SIMULATION: native
ENABLE_UNIT_TESTS: ${{inputs.test}}
OMIT_DEPRECATED: false
BUILDTYPE: debug
BUILDTYPE: release
REPO: ${{github.event.repository.name}}

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ jobs:
excludeDescription: 'true'
excludeTitle: 'true'
checkAllCommitMessages: 'true'
accessToken: ${{ secrets.GITHUB_TOKEN }}
accessToken: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/mcdc-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:

- name: Download latest main branch artifact
continue-on-error: true
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v8
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
workflow: mcdc.yml
Expand Down
45 changes: 44 additions & 1 deletion .github/workflows/test-cfs-qemu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,44 @@ jobs:
secrets: inherit
# continue-on-error: ${{ matrix.omit-deprecated }}

create-image:
name: Create Executable Images
needs: build-cfs
strategy:
matrix:
include:
- config: qemu_yocto_linux
instance: cpu1
image: yocto-image-qemuriscv64
- config: qemu_yocto_linux
instance: cpu2
image: yocto-image-qemumips
- config: pc686_rtems5
instance: cpu1
runs-on: ubuntu-22.04
container: ghcr.io/core-flight-system/cfsbuildenv-linux:latest
steps:
- name: Download artifact from build
uses: actions/download-artifact@v8
with:
name: ${{ matrix.config }}-bin
path: ${{ matrix.config }}-bin

- name: Build target images
run: /bin/false

#- name: Archive target images
# run: |
# if cd $GITHUB_WORKSPACE/build-${{ inputs.config-name }}/deploy
# then
# find -maxdepth 1 -mindepth 1 -type d | while read dir
# do
# inst=$(basename ${dir})
# tar cvf - -C ${inst} . | ${COMPRESSOR} > ${GITHUB_WORKSPACE}/${inst}-target-img.tar.${SUFFIX}
# done
# fi
#

execute-containers:
name: Execute CFS containers
permissions:
Expand All @@ -121,7 +159,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_HOST: github.com
GH_REPO: nasa/cFS
needs: build-cfs
needs: create-image
runs-on: ubuntu-22.04
strategy:
matrix:
Expand All @@ -136,6 +174,11 @@ jobs:
exec-image: ghcr.io/core-flight-system/cfsexec-linux:latest
test-procedure: 'eds'
log-fetch-method: 'direct'
- config: qemu_yocto_linux
healthcheck-regex: '^Poky (Yocto Project Reference Distro)'
exec-image: aetd-dockerlab.gsfc.nasa.gov/gsfc-cfs/github-actions-ci-cd/cfsexec-qemu
test-procedure: 'trad_be'
log-fetch-method: 'ssh'
- config: pc686_rtems5
healthcheck-regex: 'CFE_ES_Main entering OPERATIONAL state'
exec-image: ghcr.io/core-flight-system/cfsexec-qemu:latest
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/update-bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ on:
# Run daily at 1:15 am
schedule:
- cron: "15 1 * * *"
push:
branches:
- jph-update-bundle

permissions:
issues: write
Expand Down
2 changes: 1 addition & 1 deletion actions/healthcheck-logs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ runs:
IP_ADDR=$(docker inspect "${{ inputs.container-id }}" \
--format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}')
ssh-keyscan -p 2222 "$IP_ADDR" | tee -a ~/.ssh/known_hosts
cat ~/.ssh/known_hosts
cat ~/.ssh/known_hosts
30 changes: 30 additions & 0 deletions create_yocto_rootfs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash

status=1

subdir=$1
[ -z ${subdir} ] && { echo "subdirectory must be specified"; exit 1; }

container=$2
[ -z ${container} ] && { echo "container must be specified"; exit 1; }

docker pull ${container}
cont_id=$(docker create ${container} /bin/false)

[ -z ${cont_id} ] && exit 1

if mkdir -p ${subdir}
then
docker export ${cont_id} | tar x -C ${subdir} images
status=$?
fi

docker rm ${cont_id}

if [ ${status} -eq 0 ]
then
ln -sv images/$(basename ${subdir}/images/*) ${subdir}/content
status=$?
fi

exit ${status}
Loading