starlingx/update

Go to file

Lindley Vieira 68174dc155 Fix inservice 3-way merge

Ostree 3-way merge always uses the active deployment as base, but in the
cases we have an inservice patch, the inservice deployment is listed as
pending causing the ostree to loose all inservice changes in a new 3-way
merge.

This commit fixes it by point the active deployment folders, used by
ostree 3-way merge, to the pending folders. This way, ostree do the
correctly merge.

Test-Plan:
PASS: Apply a major release on top of an inservice patch
PASS: Apply and remove an inservice patch
PASS: Apply a inservice patch on top of a previous inservice patch

Closes-Bug: 2126705

Change-Id: I11282068d2148673d5225cf97e6a71099e990ac2
Signed-off-by: Lindley Vieira <lindley.vieira@windriver.com>

2025-10-03 17:48:10 -04:00

New USM rest api ref document

2024-12-04 11:28:26 -03:00

apt-ostree/debian

Build Apt-Ostree from cloned repo

2025-06-06 21:20:07 +00:00

Remove CentOS/OpenSUSE build support

2024-07-02 14:11:48 -04:00

Remove sw-patch-agent service

2024-11-25 15:05:33 +00:00

Fix: openstack-tox-docs job is broken with Sphinx >= 5.0.0

2023-08-31 17:01:12 +00:00

enable-dev-patch

Remove CentOS/OpenSUSE build support

2024-07-02 14:11:48 -04:00

Add setup_patch_repo.sh for patch-iso

2020-02-12 14:38:01 -05:00

Patches from current release in unavailable state

2025-08-11 12:39:36 -04:00

patch-boot-args

StarlingX open source release updates

2018-05-31 07:37:12 -07:00

Merge "Patch activate script to restart service"

2025-09-26 14:26:51 +00:00

Switch to newer openstackdocstheme and reno versions

2020-06-04 14:40:40 +02:00

Fix inservice 3-way merge

2025-10-03 17:48:10 -04:00

software-client

USM: Change deploy precheck and start to accept arbitrary arguments.

2025-06-03 16:10:15 -03:00

Reduce sw-patch init script controller ping timeout for simplex systems

2025-06-03 20:28:40 +00:00

.gitignore

Zuul/Tox: Update software tests

2024-10-07 10:45:15 -03:00

.gitreview

OpenDev Migration Patch

2019-04-19 19:52:36 +00:00

.zuul.yaml

Zuul/Tox: Update software tests

2024-10-07 10:45:15 -03:00

bindep.txt

Zuul: Enable missing deps for patch-alarm tests

2024-06-27 21:11:20 +00:00

CONTRIBUTORS.wrs

StarlingX open source release updates

2018-05-31 07:37:12 -07:00

debian_build_layer.cfg

Add debian_build_layer.cfg file

2021-10-05 14:12:40 -04:00

debian_iso_image.inc

Merge "Add apt-ostree Debian package"

2023-10-10 15:36:45 +00:00

debian_pkg_dirs

Merge "Add apt-ostree Debian package"

2023-10-10 15:36:45 +00:00

debian_stable_wheels.inc

Adding software-client to docker_stable_wheel.inc

2023-11-27 12:04:06 -03:00

LICENSE

StarlingX open source release updates

2018-05-31 07:37:12 -07:00

pylint.rc

Enable Unused Variable

2019-07-19 10:28:00 -04:00

README.rst

StarlingX open source release updates

2018-05-31 07:37:12 -07:00

requirements.txt

Add Zuul test foundation

2018-07-25 08:48:07 -05:00

test-requirements.txt

Adding rpm-python to bindep to fix pylint

2021-12-15 09:13:13 -06:00

tox.ini

Tox/Zuul: Docs: Resolve dependency conflict

2024-11-18 12:25:05 -03:00

README.rst

stx-update

StarlingX Software Management