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.

Sign up for GitHub

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

Jump to bottom

(BREAKING CHANGE) RTC 536910 - [source] Remove ubuntuAptSource INBM configuration tag and underlying code; replaced with source command #472

Merged
merged 18 commits into from
Feb 1, 2024
Merged

(BREAKING CHANGE) RTC 536910 - [source] Remove ubuntuAptSource INBM configuration tag and underlying code; replaced with source command #472

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c15110b
[source] Remove ubuntuAptSource configuration tag and underlying code
tsirlapu Jan 25, 2024
e627b9b
[source] Remove ubuntuAptSource configuration tag and underlying code
tsirlapu Jan 25, 2024
9b3b9f8
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Jan 25, 2024
7b31789
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Jan 25, 2024
30c11b6
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Jan 25, 2024
0bdd35f
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Jan 25, 2024
9d88cbd
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Jan 31, 2024
8e2b49a
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Jan 31, 2024
1141c1a
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Jan 31, 2024
545394c
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Jan 31, 2024
db20a0f
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Feb 1, 2024
a46a638
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Feb 1, 2024
082ca4d
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Feb 1, 2024
23af909
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Feb 1, 2024
85551cc
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Feb 1, 2024
559cb4e
Merge branch 'develop' into remove_tag2
tsirlapu Feb 1, 2024
dfbd0c9
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Feb 1, 2024
e7523ad
Merge branch 'remove_tag2' of https://github.com/intel/intel-inb-mana…
tsirlapu Feb 1, 2024
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
3 changes: 2 additions & 1 deletion docs/Configuration Parameters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ The below tables represent the different sections of the configuration file.
| token | /etc/opt/csl/csl-node/long-lived-token | path to token |
| certFile | /etc/ssl/certs/csl-ca-cert.pem | path the cert file |

### SOTA
Note: ubuntuAptSource tag is no longer used in/After 4.2.0 Version
tsirlapu marked this conversation as resolved.
Show resolved Hide resolved
tsirlapu marked this conversation as resolved.
Show resolved Hide resolved

| Key | Default Value | Description |
|:-----------------------|:----------------------:|:-----------------------------------------------------------------------------------------|
| ubuntuAptSource | http://yoururl/ubuntu/ | Location used to update Ubuntu |
tsirlapu marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 3 additions & 1 deletion docs/In-Band Manageability Developer Guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,8 @@ To send the whole manifest with edited parameters at once,
- To overwrite the existing configuration file with a new one then use
the **Load Element Manifest**.

Note: ubuntuAptSource tag is no longer used in/After 4.2.0 Version

The following commands are useful to append, remove values for
parameters that have multiple values. Parameters that have multiple
values are **trustedRepositories**, **sotaSW** and **ubuntuAptSource**.
tsirlapu marked this conversation as resolved.
Show resolved Hide resolved
tsirlapu marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -778,4 +780,4 @@ The log file contains the information such as the status, OTA type, time, metada
#### Log File Sample
```text
"{'Status': 'SUCCESS', 'Type': 'sota', 'Time': '2023-06-07 05:06:43', 'Metadata': '<?xml version=\"1.0\" encoding=\"utf-8\"?><manifest><type>ota</type><ota><header><type>sota</type><repo>remote</repo></header><type><sota><cmd logtofile=\"y\">update</cmd></sota></type></ota></manifest>', 'Error': None, 'Version': 'v1'}"
```
```
1 change: 1 addition & 0 deletions docs/In-Band Manageability User Guide - ThingsBoard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,7 @@ Events Log in the dashboard below the OTA buttons.

**Required Fields**: Command and Path

Note: ubuntuAptSource tag is no longer used in/After 4.2.0 Version

**NOTE:**
> - Append is only applicable to three configuration tags i.e
tsirlapu marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
2 changes: 2 additions & 0 deletions docs/Manifest Parameters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,8 @@ The query command can be used to gather information about the system and the Vis

#### Configuration Append Manifest Example

Note: ubuntuAptSource tag is no longer used in/After 4.2.0 Version

* Append is only applicable to three configuration tags, for example,
tsirlapu marked this conversation as resolved.
Show resolved Hide resolved
**trustedRepositories**, **sotaSW** and **ubuntuAptSource**
* Path takes in key value pair format, example: trustedRepositories: https://dummyURL.com
Expand Down
2 changes: 2 additions & 0 deletions inbm/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

### Changed
- RTC 536078 - Added package list option to inbc, cloud, and internal manifest. This allows SOTA to run an install/upgrade command on a set of individual packages rather than all installed packages.
- RTC 536910 - [source] Remove ubuntuAptSource configuration tag and underlying code
tsirlapu marked this conversation as resolved.
Show resolved Hide resolved
gblewis1 marked this conversation as resolved.
Show resolved Hide resolved


### Added
- RTC 536601 - Added 'source' command to INBM. This command manages `/etc/apt/sources.list` and `/etc/apt/sources.list.d/*` and associated gpg keys on Ubuntu.
Expand Down
3 changes: 0 additions & 3 deletions inbm/configuration-agent/fpm-template/etc/intel_manageability.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
<certFile>/etc/ssl/certs/csl-ca-cert.pem</certFile>
</orchestrator>
<sota>
<ubuntuAptSource>
http://archive.ubuntu.com/ubuntu/
</ubuntuAptSource>
<proceedWithoutRollback>true</proceedWithoutRollback>
</sota>
</configurations>
6 changes: 0 additions & 6 deletions inbm/dispatcher-agent/dispatcher/dispatcher_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,12 +569,6 @@ def config_sanitize(the_payload: Any) -> Any:
else:
self.proceed_without_rollback = cleaned_payload

if config_name == "ubuntuAptSource":
if cleaned_payload is None:
logger.error("No ubuntuAptSource selected!")
else:
self._sota_repos = cleaned_payload

try:
logger.debug('Subscribing to: %s', STATE_CHANNEL)
self._dispatcher_broker.mqtt_subscribe(STATE_CHANNEL, self._on_message)
Expand Down
2 changes: 0 additions & 2 deletions inbm/dispatcher-agent/dispatcher/sota/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
# Mender artifact path
MENDER_ARTIFACT_PATH = get_canonical_representation_of_path("/etc/mender/artifact_info")

GET_UBUNTU_PKG_REPO = "dispatcher/sota/ubuntuAptSource"

SOTA_STATE = 'normal'

LOGPATH = '/var/lib/dispatcher/upload'
Expand Down
3 changes: 1 addition & 2 deletions inbm/dispatcher-agent/dispatcher/sota/setup_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from typing import Any, Optional

from ..dispatcher_broker import DispatcherBroker
from .constants import GET_UBUNTU_PKG_REPO, APT_SOURCES_LIST_PATH, MENDER_FILE_PATH
from .constants import APT_SOURCES_LIST_PATH, MENDER_FILE_PATH
from ..common import dispatcher_state

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -55,7 +55,6 @@ def __init__(self, sota_repos: Optional[str]) -> None:
@param sota_repos: new Ubuntu/Debian mirror (or None)
"""

self._list_path = GET_UBUNTU_PKG_REPO
self._sota_repos = sota_repos
super().__init__()

Expand Down
3 changes: 0 additions & 3 deletions inbm/integration-reloaded/scripts/iotg_inb_developer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
<certFile>/etc/ssl/certs/csl-ca-cert.pem</certFile>
</orchestrator>
<sota>
<ubuntuAptSource>
http://archive.ubuntu.com/ubuntu/
</ubuntuAptSource>
<proceedWithoutRollback>true</proceedWithoutRollback>
</sota>
</configurations>
3 changes: 0 additions & 3 deletions inbm/integration-reloaded/scripts/iotg_inb_developer_no_nw_check.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
<certFile>/etc/ssl/certs/csl-ca-cert.pem</certFile>
</orchestrator>
<sota>
<ubuntuAptSource>
http://archive.ubuntu.com/ubuntu/
</ubuntuAptSource>
<proceedWithoutRollback>true</proceedWithoutRollback>
</sota>
</configurations>
3 changes: 0 additions & 3 deletions inbm/packaging/windows-override/inbm/etc/intel_manageability.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
</trustedRepositories>
</dispatcher>
<sota>
<ubuntuAptSource>
http://archive.ubuntu.com/ubuntu/
</ubuntuAptSource>
<proceedWithoutRollback>true</proceedWithoutRollback>
</sota>
</configurations>