Consolidate devel task into unit with --ansible-core-branch flag.

Removes the standalone `invoke devel` task and adds an
`--ansible-core-branch` option to `invoke unit` instead. Moves the
ansible-core branch install in the Dockerfile after `poetry install`
so the lock file version does not overwrite it. Updates the scheduled
devel workflow to use the new flag.

Author: jvanderaa

.github/workflows/trigger_scheduled_devel.yml

@@ -33,4 +33,4 @@ jobs:
       - name: "Install invoke"
         run: "pip install -U pip && pip install invoke packaging"
       - name: "Run tests against ansible-core ${{ env.ANSIBLE_CORE_BRANCH }}"
-        run: "invoke devel --branch ${{ env.ANSIBLE_CORE_BRANCH }} --skip lint"
+        run: "invoke unit --ansible-core-branch ${{ env.ANSIBLE_CORE_BRANCH }} --skip lint"

Dockerfile

@@ -37,14 +37,6 @@ COPY pyproject.toml poetry.lock ./
 # Install only package Dependencies
 RUN poetry install --only main
 
-# Optionally install ansible-core from a specific branch (e.g. "devel" or "milestone")
-ARG ANSIBLE_CORE_BRANCH
-RUN if [ -n "${ANSIBLE_CORE_BRANCH}" ]; then \
-    pip install --upgrade pip setuptools && \
-    pip install --force-reinstall --no-deps \
-    "https://github.com/ansible/ansible/archive/${ANSIBLE_CORE_BRANCH}.tar.gz"; \
-    fi
-
 #########
 # Linting
 #
@@ -57,6 +49,15 @@ ENV SKIP_LINT_TESTS=${SKIP_LINT_TESTS}
 # Install dev dependencies
 RUN poetry install
 
+# Optionally install ansible-core from a specific branch (e.g. "devel" or "milestone")
+# This must come AFTER poetry install so the lock file version doesn't overwrite it.
+ARG ANSIBLE_CORE_BRANCH
+RUN if [ -n "${ANSIBLE_CORE_BRANCH}" ]; then \
+    pip install --upgrade pip setuptools && \
+    pip install --force-reinstall --no-deps \
+    "https://github.com/ansible/ansible/archive/${ANSIBLE_CORE_BRANCH}.tar.gz"; \
+    fi
+
 # Copy in the application source and everything not explicitly banned by .dockerignore
 COPY . .
 

tasks.py

@@ -242,13 +242,16 @@ def lint(context):
     help={
         "verbose": "Run the tests with verbose output; can be provided multiple times for more verbosity (e.g. -v, -vv, -vvv)",
         "skip": "Skip specific tests (choices: lint, sanity, unit); can be provided multiple times (e.g. --skip lint --skip sanity)",
+        "ansible_core_branch": "Test against a specific ansible-core git branch (e.g. 'devel', 'milestone')",
     },
     iterable=["skip"],
     incrementable=["verbose"],
 )
-def unit(context, verbose=0, skip=None):
+def unit(context, verbose=0, skip=None, ansible_core_branch=None):
     """Run unit tests."""
     env = {"PYTHON_VER": context.nautobot_ansible.python_ver}
+    if ansible_core_branch is not None:
+        env["ANSIBLE_CORE_BRANCH"] = ansible_core_branch
     if verbose:
         env["ANSIBLE_SANITY_ARGS"] = f"-{'v' * verbose}"
         env["ANSIBLE_UNIT_ARGS"] = f"-{'v' * verbose}"
@@ -324,40 +327,6 @@ def integration(context, verbose=0, tags=None, update_inventories=False, skip=No
     destroy(context)
 
 
-@task(
-    help={
-        "branch": "The ansible-core git branch to test against (default: devel)",
-        "python_ver": "Python version to use (default: 3.12)",
-        "verbose": "Run the tests with verbose output; can be provided multiple times for more verbosity",
-        "skip": "Skip specific tests (choices: lint, sanity, unit); can be provided multiple times",
-    },
-    iterable=["skip"],
-    incrementable=["verbose"],
-)
-def devel(context, branch="devel", python_ver="3.12", verbose=0, skip=None):
-    """Run sanity and unit tests against an ansible-core development branch."""
-    env = {
-        "PYTHON_VER": python_ver,
-        "ANSIBLE_CORE_BRANCH": branch,
-    }
-    if verbose:
-        env["ANSIBLE_SANITY_ARGS"] = f"-{'v' * verbose}"
-        env["ANSIBLE_UNIT_ARGS"] = f"-{'v' * verbose}"
-    if skip is not None:
-        if "lint" in skip:
-            env["SKIP_LINT_TESTS"] = "true"
-        if "sanity" in skip:
-            env["SKIP_SANITY_TESTS"] = "true"
-        if "unit" in skip:
-            env["SKIP_UNIT_TESTS"] = "true"
-    print(f"Running tests against ansible-core branch: {branch}")
-    context.run(
-        f"docker compose --project-name {context.nautobot_ansible.project_name} up --build --force-recreate --exit-code-from unit unit",
-        env=env,
-    )
-    context.run(f"docker compose --project-name {context.nautobot_ansible.project_name} down")
-
-
 @task(
     help={
         "force": "Force the build command to create a new collection, overwriting any existing files.",