Skip to content

Commit

Permalink
Merge pull request #2764 from reubenmiller/issue-2762-remove-git-lfs
Browse files Browse the repository at this point in the history
tests: remove git lfs dependency by using official thin-edge.io packages
  • Loading branch information
reubenmiller authored Mar 6, 2024
2 parents ba3a53e + 1bdcb43 commit c66aafc
Show file tree
Hide file tree
Showing 23 changed files with 2 additions and 117 deletions.
23 changes: 0 additions & 23 deletions .gitattributes

This file was deleted.

20 changes: 0 additions & 20 deletions tests/RobotFramework/bin/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,6 @@ pushd "$SCRIPT_DIR/.." >/dev/null || exit 1
# Required to prevent dbus errors on raspberry pi
export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring

# Use git lfs for test artefacts
if ! git lfs env >/dev/null 2>&1; then
# install git-lfs dependency, try proceeding anyway if a package manager is not found
if command -V apt-get >/dev/null 2>&1; then
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
sudo apt-get install -y --no-install-recommends git-lfs
elif command -V yum >/dev/null 2>&1; then
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
sudo yum install -y git-lfs
elif command -V dnf >/dev/null 2>&1; then
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
sudo dnf install -y git-lfs
elif command -V brew >/dev/null 2>&1; then
brew install git-lfs
fi
fi

git lfs install
git lfs pull

#
# Setup python virtual environment and install dependencies
#
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,8 @@ Refreshes mosquitto bridge configuration
Execute Command cmd=sh -c '[ $(journalctl -u mosquitto | grep -c "Loading config file /etc/tedge/mosquitto-conf/c8y-bridge.conf") = 2 ]'

Update tedge version from base to current using Cumulocity
${arch}= Get Debian Architecture
Execute Command mkdir -p /setup/base-version
# These base-version packages are built using the ci/build_scripts/build.sh script for all 4 supported architectures
# by overriding the version to a lower number using the GIT_SEMVER env variable
Transfer To Device ${CURDIR}/base-version/*${arch}.deb /setup/base-version/

# Install base version with self-update capability
Install Packages /setup/base-version
# Install base version (the latest official release) with self-update capability
Execute Command wget -O - thin-edge.io/install.sh | sh -s
Execute Command cd /setup && test -f ./bootstrap.sh && ./bootstrap.sh --no-install --no-secure
Device Should Exist ${DEVICE_SN}
${pid_before}= Service Should Be Running tedge-agent
Expand Down Expand Up @@ -141,9 +135,3 @@ Create Local Repository
Set Suite Variable $NEW_VERSION_ESCAPED
Execute Command cd /opt/repository/local && dpkg-scanpackages -m . > Packages
Execute Command cmd=echo 'deb [trusted=yes] file:/opt/repository/local /' > /etc/apt/sources.list.d/tedge-local.list

Install Packages
[Arguments] ${packages_dir}=/setup/packages

Execute Command apt-get update && apt-get install -y --no-install-recommends mosquitto
Execute Command cd ${packages_dir} && dpkg -i tedge_*.deb && dpkg -i tedge*mapper*.deb && dpkg -i tedge*agent*.deb && dpkg -i tedge*watchdog*.deb && dpkg -i tedge*apt*plugin*.deb

0 comments on commit c66aafc

Please sign in to comment.