Skip to content

QA-1464 - Mender Client version#2839

Open
danielskinstad wants to merge 2 commits intomendersoftware:masterfrom
danielskinstad:QA-1464-version-marker
Open

QA-1464 - Mender Client version#2839
danielskinstad wants to merge 2 commits intomendersoftware:masterfrom
danielskinstad:QA-1464-version-marker

Conversation

@danielskinstad
Copy link
Contributor

No description provided.

@mender-test-bot
Copy link

@danielskinstad, start a full integration test pipeline with:

  • mentioning me and start integration pipeline

my commands and options

You can prevent me from automatically starting CI pipelines:

  • if your pull request title starts with "[NoCI] ..."

You can trigger a client pipeline on multiple prs with:

  • mentioning me and start client pipeline --pr mender/127 --pr mender-connect/255

You can trigger GitHub->GitLab branch sync with:

  • mentioning me and sync

You can cherry pick to a given branch or branches with:

  • mentioning me and:
 cherry-pick to:
 * 1.0.x
 * 2.0.x

@danielskinstad
Copy link
Contributor Author

@mender-test-bot start integration pipeline

@mender-test-bot
Copy link

Hello 😺 I created a pipeline for you here: Pipeline-2337322896

Build Configuration Matrix

Key Value
INTEGRATION_REV pull/2839/head
RUN_TESTS_FULL_INTEGRATION true

`min_mender_client_version` was unused and rather than getting the
minimum version from the env, it got it from the release tool.
Added a new variable, `MENDER_CLIENT_VERSION`, that determines when to run
tests marked with `min_mender_client_version`.

Ticket: QA-1464

Signed-off-by: Daniel Skinstad Drabitzius <daniel.drabitzius@northern.tech>
The docker-compose UM will part of the Mender Client 6

Signed-off-by: Daniel Skinstad Drabitzius <daniel.drabitzius@northern.tech>
Copy link
Member

@lluiscampos lluiscampos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

def version_is_minimum(version, min_version):
# Handle maintenance branch patterns like "5.0.x"
# Replace .x with 99 to ensure that we run correct tests on maintenance branches
version_normalized = re.sub(r"\.x\b", ".99", version)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea

MENDER_CONTAINER_MODULES_VERSION=main

# Version of the Mender Client "bundle"
MENDER_CLIENT_VERSION=master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about default main here?

I understand that when running the integration tests from the client pipeline we will be feeding in the MENDER_CLIENT_SUBCOMPONENTS_REV as MENDER_CLIENT_VERSION.

You can argue that the virtual device versions still use -master, so take this as an open ended suggestion really.

return make_artifact


@pytest.mark.min_mender_client_version("6.0.0")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So simple 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments