chore(gitlab-ci): Automated update of git sub-module #10

Merged
nfc_bot merged 2 commits from automated-tasks into development 2024-02-22 08:35:24 +00:00
nfc_bot commented 2024-02-22 08:04:20 +00:00 (Migrated from gitlab.com)

:notepad_spiral: Summary

This is Merge Request is part of an task that is automated with ansible. This Merge Request is being raised to update the git sub-modules

🤖 Automation data


{
    "gitmodules": [
        {
            "branch": "development",
            "current_commit": "e046f9ea49a617ce91ff2eda53b897f798dfb810)",
            "name": "gitlab-ci",
            "path": "/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci",
            "remote_head": "74ac15925c75ba0178ae21932b02b6a90a9169c3)",
            "remote_name": "origin",
            "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
        }
    ]
}

For more information please see the documentation

## :notepad_spiral: Summary This is Merge Request is part of an task that is automated with ansible. This Merge Request is being raised to update the git sub-modules ### :link: Links / References - Gitlab Job [6230864991](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6230864991) ### :robot: Automation data ``` json { "gitmodules": [ { "branch": "development", "current_commit": "e046f9ea49a617ce91ff2eda53b897f798dfb810)", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci", "remote_head": "74ac15925c75ba0178ae21932b02b6a90a9169c3)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } ] } ``` For more information please see the [documentation](https://gitlab.com/nofusscomputing/projects/ansible/git_configuration)
nfc_bot commented 2024-02-22 08:04:20 +00:00 (Migrated from gitlab.com)

assigned to @nfc_bot

assigned to @nfc_bot
nfc_bot commented 2024-02-22 08:04:23 +00:00 (Migrated from gitlab.com)

mentioned in commit 9f88f7814f

mentioned in commit 9f88f7814f9ffd064484e238b64be61e26c71bde
nfc_bot commented 2024-02-22 08:04:23 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 9f88f781 - chore(git): updated submodule gitlab-ci

Compare with previous version

added 1 commit <ul><li>9f88f781 - chore(git): updated submodule gitlab-ci</li></ul> [Compare with previous version](/nofusscomputing/projects/docker-bind/-/merge_requests/10/diffs?diff_id=932546430&start_sha=349533abb0ec3e5ff00533ea57704b0d21e20dc6)
nfc_bot commented 2024-02-22 08:04:45 +00:00 (Migrated from gitlab.com)

This automated job has auto_merge=True, As such this merge request will be merged.

Automation Data:

{
    "gitmodules": [
        {
            "branch": "development",
            "current_commit": "e046f9ea49a617ce91ff2eda53b897f798dfb810)",
            "name": "gitlab-ci",
            "path": "/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci",
            "remote_head": "74ac15925c75ba0178ae21932b02b6a90a9169c3)",
            "remote_name": "origin",
            "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
        }
    ]
}

This Merge request does not require approval.

This automated job has auto_merge=True, As such this merge request will be merged. :white_check_mark: - :link: Gitlab Job [6230864991](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6230864991) <details><summary>Automation Data:</summary> ```json { "gitmodules": [ { "branch": "development", "current_commit": "e046f9ea49a617ce91ff2eda53b897f798dfb810)", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci", "remote_head": "74ac15925c75ba0178ae21932b02b6a90a9169c3)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } ] } ``` </details> This Merge request does not require approval. :white_check_mark:
nfc_bot commented 2024-02-22 08:04:47 +00:00 (Migrated from gitlab.com)

I'm unabe to merge!!

When I tried 'Branch cannot be merged' was returned

Debug Information

Existing MR

""

Create Merge Request

{
    "approvals_before_merge": null,
    "assignee": {
        "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon",
        "id": 10521424,
        "locked": false,
        "name": "No Fuss Computing Bot",
        "state": "active",
        "username": "nfc_bot",
        "web_url": "https://gitlab.com/nfc_bot"
    },
    "assignees": [
        {
            "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon",
            "id": 10521424,
            "locked": false,
            "name": "No Fuss Computing Bot",
            "state": "active",
            "username": "nfc_bot",
            "web_url": "https://gitlab.com/nfc_bot"
        }
    ],
    "author": {
        "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon",
        "id": 10521424,
        "locked": false,
        "name": "No Fuss Computing Bot",
        "state": "active",
        "username": "nfc_bot",
        "web_url": "https://gitlab.com/nfc_bot"
    },
    "blocking_discussions_resolved": true,
    "changes_count": null,
    "closed_at": null,
    "closed_by": null,
    "created_at": "2024-02-22T08:04:20.538Z",
    "description": "## :notepad_spiral: Summary\n\nThis is Merge Request is part of an task that is automated with ansible. This Merge Request is being raised to update the git sub-modules\n\n\n### :link: Links / References\n\n- Gitlab Job [6230864991](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6230864991)\n\n\n### :robot: Automation data\n\n``` json\n\n{\n    \"gitmodules\": [\n        {\n            \"branch\": \"development\",\n            \"current_commit\": \"e046f9ea49a617ce91ff2eda53b897f798dfb810)\",\n            \"name\": \"gitlab-ci\",\n            \"path\": \"/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci\",\n            \"remote_head\": \"74ac15925c75ba0178ae21932b02b6a90a9169c3)\",\n            \"remote_name\": \"origin\",\n            \"url\": \"https://gitlab.com/nofusscomputing/projects/gitlab-ci.git\"\n        }\n    ]\n}\n\n```\n\nFor more information please see the [documentation](https://gitlab.com/nofusscomputing/projects/ansible/git_configuration)",
    "detailed_merge_status": "preparing",
    "diff_refs": null,
    "discussion_locked": null,
    "downvotes": 0,
    "draft": false,
    "first_deployed_to_production_at": null,
    "force_remove_source_branch": null,
    "has_conflicts": false,
    "head_pipeline": null,
    "id": 283850192,
    "iid": 10,
    "labels": [
        "impact::0",
        "priority::0",
        "type::automation"
    ],
    "latest_build_finished_at": null,
    "latest_build_started_at": null,
    "merge_commit_sha": null,
    "merge_error": null,
    "merge_status": "checking",
    "merge_user": null,
    "merge_when_pipeline_succeeds": false,
    "merged_at": null,
    "merged_by": null,
    "milestone": null,
    "pipeline": null,
    "prepared_at": null,
    "project_id": 52098058,
    "reference": "!10",
    "references": {
        "full": "nofusscomputing/projects/docker-bind!10",
        "relative": "!10",
        "short": "!10"
    },
    "reviewers": [],
    "sha": "349533abb0ec3e5ff00533ea57704b0d21e20dc6",
    "should_remove_source_branch": null,
    "source_branch": "automated-tasks",
    "source_project_id": 52098058,
    "squash": false,
    "squash_commit_sha": null,
    "squash_on_merge": false,
    "state": "opened",
    "subscribed": true,
    "target_branch": "development",
    "target_project_id": 52098058,
    "task_completion_status": {
        "completed_count": 0,
        "count": 0
    },
    "time_stats": {
        "human_time_estimate": null,
        "human_total_time_spent": null,
        "time_estimate": 0,
        "total_time_spent": 0
    },
    "title": "chore(gitlab-ci): Automated update of git sub-module",
    "updated_at": "2024-02-22T08:04:20.774Z",
    "upvotes": 0,
    "user": {
        "can_merge": true
    },
    "user_notes_count": 0,
    "web_url": "https://gitlab.com/nofusscomputing/projects/docker-bind/-/merge_requests/10",
    "work_in_progress": false
}
  • push changes if any
  • Pause for 20 Seconds

Fetch merge request

{
    "approvals_before_merge": null,
    "assignee": {
        "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon",
        "id": 10521424,
        "locked": false,
        "name": "No Fuss Computing Bot",
        "state": "active",
        "username": "nfc_bot",
        "web_url": "https://gitlab.com/nfc_bot"
    },
    "assignees": [
        {
            "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon",
            "id": 10521424,
            "locked": false,
            "name": "No Fuss Computing Bot",
            "state": "active",
            "username": "nfc_bot",
            "web_url": "https://gitlab.com/nfc_bot"
        }
    ],
    "author": {
        "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon",
        "id": 10521424,
        "locked": false,
        "name": "No Fuss Computing Bot",
        "state": "active",
        "username": "nfc_bot",
        "web_url": "https://gitlab.com/nfc_bot"
    },
    "blocking_discussions_resolved": true,
    "changes_count": "1",
    "closed_at": null,
    "closed_by": null,
    "created_at": "2024-02-22T08:04:20.538Z",
    "description": "## :notepad_spiral: Summary\n\nThis is Merge Request is part of an task that is automated with ansible. This Merge Request is being raised to update the git sub-modules\n\n\n### :link: Links / References\n\n- Gitlab Job [6230864991](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6230864991)\n\n\n### :robot: Automation data\n\n``` json\n\n{\n    \"gitmodules\": [\n        {\n            \"branch\": \"development\",\n            \"current_commit\": \"e046f9ea49a617ce91ff2eda53b897f798dfb810)\",\n            \"name\": \"gitlab-ci\",\n            \"path\": \"/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci\",\n            \"remote_head\": \"74ac15925c75ba0178ae21932b02b6a90a9169c3)\",\n            \"remote_name\": \"origin\",\n            \"url\": \"https://gitlab.com/nofusscomputing/projects/gitlab-ci.git\"\n        }\n    ]\n}\n\n```\n\nFor more information please see the [documentation](https://gitlab.com/nofusscomputing/projects/ansible/git_configuration)",
    "detailed_merge_status": "conflict",
    "diff_refs": {
        "base_sha": "349533abb0ec3e5ff00533ea57704b0d21e20dc6",
        "head_sha": "9f88f7814f9ffd064484e238b64be61e26c71bde",
        "start_sha": "349533abb0ec3e5ff00533ea57704b0d21e20dc6"
    },
    "discussion_locked": null,
    "downvotes": 0,
    "draft": false,
    "first_contribution": false,
    "first_deployed_to_production_at": null,
    "force_remove_source_branch": null,
    "has_conflicts": true,
    "head_pipeline": {
        "before_sha": "349533abb0ec3e5ff00533ea57704b0d21e20dc6",
        "committed_at": null,
        "coverage": null,
        "created_at": "2024-02-22T08:04:24.314Z",
        "detailed_status": {
            "details_path": "/nofusscomputing/projects/docker-bind/-/pipelines/1186121778",
            "favicon": "/assets/ci_favicons/favicon_status_running-9c635b2419a8e1ec991c993061b89cc5aefc0743bb238ecd0c381e7741a70e8c.png",
            "group": "running",
            "has_details": true,
            "icon": "status_running",
            "illustration": null,
            "label": "running",
            "text": "Running",
            "tooltip": "running"
        },
        "duration": null,
        "finished_at": null,
        "id": 1186121778,
        "iid": 46,
        "project_id": 52098058,
        "queued_duration": 1,
        "ref": "automated-tasks",
        "sha": "9f88f7814f9ffd064484e238b64be61e26c71bde",
        "source": "push",
        "started_at": "2024-02-22T08:04:25.587Z",
        "status": "running",
        "tag": false,
        "updated_at": "2024-02-22T08:04:25.588Z",
        "user": {
            "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon",
            "id": 10521424,
            "locked": false,
            "name": "No Fuss Computing Bot",
            "state": "active",
            "username": "nfc_bot",
            "web_url": "https://gitlab.com/nfc_bot"
        },
        "web_url": "https://gitlab.com/nofusscomputing/projects/docker-bind/-/pipelines/1186121778",
        "yaml_errors": null
    },
    "id": 283850192,
    "iid": 10,
    "labels": [
        "impact::0",
        "priority::0",
        "type::automation"
    ],
    "latest_build_finished_at": null,
    "latest_build_started_at": "2024-02-22T08:04:25.587Z",
    "merge_commit_sha": null,
    "merge_error": null,
    "merge_status": "cannot_be_merged",
    "merge_user": null,
    "merge_when_pipeline_succeeds": false,
    "merged_at": null,
    "merged_by": null,
    "milestone": null,
    "pipeline": {
        "created_at": "2024-02-22T08:04:24.314Z",
        "id": 1186121778,
        "iid": 46,
        "project_id": 52098058,
        "ref": "automated-tasks",
        "sha": "9f88f7814f9ffd064484e238b64be61e26c71bde",
        "source": "push",
        "status": "running",
        "updated_at": "2024-02-22T08:04:25.588Z",
        "web_url": "https://gitlab.com/nofusscomputing/projects/docker-bind/-/pipelines/1186121778"
    },
    "prepared_at": "2024-02-22T08:04:22.831Z",
    "project_id": 52098058,
    "reference": "!10",
    "references": {
        "full": "nofusscomputing/projects/docker-bind!10",
        "relative": "!10",
        "short": "!10"
    },
    "reviewers": [],
    "sha": "9f88f7814f9ffd064484e238b64be61e26c71bde",
    "should_remove_source_branch": null,
    "source_branch": "automated-tasks",
    "source_project_id": 52098058,
    "squash": false,
    "squash_commit_sha": null,
    "squash_on_merge": false,
    "state": "opened",
    "subscribed": true,
    "target_branch": "development",
    "target_project_id": 52098058,
    "task_completion_status": {
        "completed_count": 0,
        "count": 0
    },
    "time_stats": {
        "human_time_estimate": null,
        "human_total_time_spent": null,
        "time_estimate": 0,
        "total_time_spent": 0
    },
    "title": "chore(gitlab-ci): Automated update of git sub-module",
    "updated_at": "2024-02-22T08:04:22.844Z",
    "upvotes": 0,
    "user": {
        "can_merge": true
    },
    "user_notes_count": 0,
    "web_url": "https://gitlab.com/nofusscomputing/projects/docker-bind/-/merge_requests/10",
    "work_in_progress": false
}

Fetch Approvals

{
    "approval_rules_left": [],
    "approvals_left": 0,
    "approvals_required": 0,
    "approved": true,
    "approved_by": [],
    "approver_groups": [],
    "approvers": [],
    "created_at": "2024-02-22T08:04:20.538Z",
    "description": "## :notepad_spiral: Summary\n\nThis is Merge Request is part of an task that is automated with ansible. This Merge Request is being raised to update the git sub-modules\n\n\n### :link: Links / References\n\n- Gitlab Job [6230864991](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6230864991)\n\n\n### :robot: Automation data\n\n``` json\n\n{\n    \"gitmodules\": [\n        {\n            \"branch\": \"development\",\n            \"current_commit\": \"e046f9ea49a617ce91ff2eda53b897f798dfb810)\",\n            \"name\": \"gitlab-ci\",\n            \"path\": \"/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci\",\n            \"remote_head\": \"74ac15925c75ba0178ae21932b02b6a90a9169c3)\",\n            \"remote_name\": \"origin\",\n            \"url\": \"https://gitlab.com/nofusscomputing/projects/gitlab-ci.git\"\n        }\n    ]\n}\n\n```\n\nFor more information please see the [documentation](https://gitlab.com/nofusscomputing/projects/ansible/git_configuration)",
    "has_approval_rules": false,
    "id": 283850192,
    "iid": 10,
    "invalid_approvers_rules": [],
    "merge_request_approvers_available": true,
    "merge_status": "cannot_be_merged",
    "multiple_approval_rules_available": true,
    "project_id": 52098058,
    "require_password_to_approve": false,
    "state": "opened",
    "suggested_approvers": [],
    "title": "chore(gitlab-ci): Automated update of git sub-module",
    "updated_at": "2024-02-22T08:04:22.844Z",
    "user_can_approve": false,
    "user_has_approved": false
}

Approve MR

""

sub module details:

{
    "gitmodules": [
        {
            "branch": "development",
            "current_commit": "e046f9ea49a617ce91ff2eda53b897f798dfb810)",
            "name": "gitlab-ci",
            "path": "/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci",
            "remote_head": "74ac15925c75ba0178ae21932b02b6a90a9169c3)",
            "remote_name": "origin",
            "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
        }
    ]
}

Git Status, prior to git add and git commit

On branch automated-tasks
Your branch is up to date with 'automation/development'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   .gitmodules
	modified:   gitlab-ci (new commits)

no changes added to commit (use "git add" and/or "git commit -a")

Merge the Merge Request return:

{'message': 'Branch cannot be merged'}

other facts:

"ansible_facts": {
  "merge_request_approval_require_password": False,
  "merge_request_approved": True,
  "merge_request_needs_approval": 0,
  "merge_request_user_can_approve": False
}
I'm unabe to merge!! When I tried 'Branch cannot be merged' was returned <details> <summary>Debug Information</summary> Existing MR ```json "" ``` Create Merge Request ```json { "approvals_before_merge": null, "assignee": { "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon", "id": 10521424, "locked": false, "name": "No Fuss Computing Bot", "state": "active", "username": "nfc_bot", "web_url": "https://gitlab.com/nfc_bot" }, "assignees": [ { "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon", "id": 10521424, "locked": false, "name": "No Fuss Computing Bot", "state": "active", "username": "nfc_bot", "web_url": "https://gitlab.com/nfc_bot" } ], "author": { "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon", "id": 10521424, "locked": false, "name": "No Fuss Computing Bot", "state": "active", "username": "nfc_bot", "web_url": "https://gitlab.com/nfc_bot" }, "blocking_discussions_resolved": true, "changes_count": null, "closed_at": null, "closed_by": null, "created_at": "2024-02-22T08:04:20.538Z", "description": "## :notepad_spiral: Summary\n\nThis is Merge Request is part of an task that is automated with ansible. This Merge Request is being raised to update the git sub-modules\n\n\n### :link: Links / References\n\n- Gitlab Job [6230864991](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6230864991)\n\n\n### :robot: Automation data\n\n``` json\n\n{\n \"gitmodules\": [\n {\n \"branch\": \"development\",\n \"current_commit\": \"e046f9ea49a617ce91ff2eda53b897f798dfb810)\",\n \"name\": \"gitlab-ci\",\n \"path\": \"/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci\",\n \"remote_head\": \"74ac15925c75ba0178ae21932b02b6a90a9169c3)\",\n \"remote_name\": \"origin\",\n \"url\": \"https://gitlab.com/nofusscomputing/projects/gitlab-ci.git\"\n }\n ]\n}\n\n```\n\nFor more information please see the [documentation](https://gitlab.com/nofusscomputing/projects/ansible/git_configuration)", "detailed_merge_status": "preparing", "diff_refs": null, "discussion_locked": null, "downvotes": 0, "draft": false, "first_deployed_to_production_at": null, "force_remove_source_branch": null, "has_conflicts": false, "head_pipeline": null, "id": 283850192, "iid": 10, "labels": [ "impact::0", "priority::0", "type::automation" ], "latest_build_finished_at": null, "latest_build_started_at": null, "merge_commit_sha": null, "merge_error": null, "merge_status": "checking", "merge_user": null, "merge_when_pipeline_succeeds": false, "merged_at": null, "merged_by": null, "milestone": null, "pipeline": null, "prepared_at": null, "project_id": 52098058, "reference": "!10", "references": { "full": "nofusscomputing/projects/docker-bind!10", "relative": "!10", "short": "!10" }, "reviewers": [], "sha": "349533abb0ec3e5ff00533ea57704b0d21e20dc6", "should_remove_source_branch": null, "source_branch": "automated-tasks", "source_project_id": 52098058, "squash": false, "squash_commit_sha": null, "squash_on_merge": false, "state": "opened", "subscribed": true, "target_branch": "development", "target_project_id": 52098058, "task_completion_status": { "completed_count": 0, "count": 0 }, "time_stats": { "human_time_estimate": null, "human_total_time_spent": null, "time_estimate": 0, "total_time_spent": 0 }, "title": "chore(gitlab-ci): Automated update of git sub-module", "updated_at": "2024-02-22T08:04:20.774Z", "upvotes": 0, "user": { "can_merge": true }, "user_notes_count": 0, "web_url": "https://gitlab.com/nofusscomputing/projects/docker-bind/-/merge_requests/10", "work_in_progress": false } ``` - *push changes if any* - *Pause for 20 Seconds* Fetch merge request ```json { "approvals_before_merge": null, "assignee": { "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon", "id": 10521424, "locked": false, "name": "No Fuss Computing Bot", "state": "active", "username": "nfc_bot", "web_url": "https://gitlab.com/nfc_bot" }, "assignees": [ { "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon", "id": 10521424, "locked": false, "name": "No Fuss Computing Bot", "state": "active", "username": "nfc_bot", "web_url": "https://gitlab.com/nfc_bot" } ], "author": { "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon", "id": 10521424, "locked": false, "name": "No Fuss Computing Bot", "state": "active", "username": "nfc_bot", "web_url": "https://gitlab.com/nfc_bot" }, "blocking_discussions_resolved": true, "changes_count": "1", "closed_at": null, "closed_by": null, "created_at": "2024-02-22T08:04:20.538Z", "description": "## :notepad_spiral: Summary\n\nThis is Merge Request is part of an task that is automated with ansible. This Merge Request is being raised to update the git sub-modules\n\n\n### :link: Links / References\n\n- Gitlab Job [6230864991](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6230864991)\n\n\n### :robot: Automation data\n\n``` json\n\n{\n \"gitmodules\": [\n {\n \"branch\": \"development\",\n \"current_commit\": \"e046f9ea49a617ce91ff2eda53b897f798dfb810)\",\n \"name\": \"gitlab-ci\",\n \"path\": \"/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci\",\n \"remote_head\": \"74ac15925c75ba0178ae21932b02b6a90a9169c3)\",\n \"remote_name\": \"origin\",\n \"url\": \"https://gitlab.com/nofusscomputing/projects/gitlab-ci.git\"\n }\n ]\n}\n\n```\n\nFor more information please see the [documentation](https://gitlab.com/nofusscomputing/projects/ansible/git_configuration)", "detailed_merge_status": "conflict", "diff_refs": { "base_sha": "349533abb0ec3e5ff00533ea57704b0d21e20dc6", "head_sha": "9f88f7814f9ffd064484e238b64be61e26c71bde", "start_sha": "349533abb0ec3e5ff00533ea57704b0d21e20dc6" }, "discussion_locked": null, "downvotes": 0, "draft": false, "first_contribution": false, "first_deployed_to_production_at": null, "force_remove_source_branch": null, "has_conflicts": true, "head_pipeline": { "before_sha": "349533abb0ec3e5ff00533ea57704b0d21e20dc6", "committed_at": null, "coverage": null, "created_at": "2024-02-22T08:04:24.314Z", "detailed_status": { "details_path": "/nofusscomputing/projects/docker-bind/-/pipelines/1186121778", "favicon": "/assets/ci_favicons/favicon_status_running-9c635b2419a8e1ec991c993061b89cc5aefc0743bb238ecd0c381e7741a70e8c.png", "group": "running", "has_details": true, "icon": "status_running", "illustration": null, "label": "running", "text": "Running", "tooltip": "running" }, "duration": null, "finished_at": null, "id": 1186121778, "iid": 46, "project_id": 52098058, "queued_duration": 1, "ref": "automated-tasks", "sha": "9f88f7814f9ffd064484e238b64be61e26c71bde", "source": "push", "started_at": "2024-02-22T08:04:25.587Z", "status": "running", "tag": false, "updated_at": "2024-02-22T08:04:25.588Z", "user": { "avatar_url": "https://secure.gravatar.com/avatar/95c7d00e9e4bbd1785b3a616d11a7bfb83874c635082b7797415960ff567afd0?s=80&d=identicon", "id": 10521424, "locked": false, "name": "No Fuss Computing Bot", "state": "active", "username": "nfc_bot", "web_url": "https://gitlab.com/nfc_bot" }, "web_url": "https://gitlab.com/nofusscomputing/projects/docker-bind/-/pipelines/1186121778", "yaml_errors": null }, "id": 283850192, "iid": 10, "labels": [ "impact::0", "priority::0", "type::automation" ], "latest_build_finished_at": null, "latest_build_started_at": "2024-02-22T08:04:25.587Z", "merge_commit_sha": null, "merge_error": null, "merge_status": "cannot_be_merged", "merge_user": null, "merge_when_pipeline_succeeds": false, "merged_at": null, "merged_by": null, "milestone": null, "pipeline": { "created_at": "2024-02-22T08:04:24.314Z", "id": 1186121778, "iid": 46, "project_id": 52098058, "ref": "automated-tasks", "sha": "9f88f7814f9ffd064484e238b64be61e26c71bde", "source": "push", "status": "running", "updated_at": "2024-02-22T08:04:25.588Z", "web_url": "https://gitlab.com/nofusscomputing/projects/docker-bind/-/pipelines/1186121778" }, "prepared_at": "2024-02-22T08:04:22.831Z", "project_id": 52098058, "reference": "!10", "references": { "full": "nofusscomputing/projects/docker-bind!10", "relative": "!10", "short": "!10" }, "reviewers": [], "sha": "9f88f7814f9ffd064484e238b64be61e26c71bde", "should_remove_source_branch": null, "source_branch": "automated-tasks", "source_project_id": 52098058, "squash": false, "squash_commit_sha": null, "squash_on_merge": false, "state": "opened", "subscribed": true, "target_branch": "development", "target_project_id": 52098058, "task_completion_status": { "completed_count": 0, "count": 0 }, "time_stats": { "human_time_estimate": null, "human_total_time_spent": null, "time_estimate": 0, "total_time_spent": 0 }, "title": "chore(gitlab-ci): Automated update of git sub-module", "updated_at": "2024-02-22T08:04:22.844Z", "upvotes": 0, "user": { "can_merge": true }, "user_notes_count": 0, "web_url": "https://gitlab.com/nofusscomputing/projects/docker-bind/-/merge_requests/10", "work_in_progress": false } ``` Fetch Approvals ```json { "approval_rules_left": [], "approvals_left": 0, "approvals_required": 0, "approved": true, "approved_by": [], "approver_groups": [], "approvers": [], "created_at": "2024-02-22T08:04:20.538Z", "description": "## :notepad_spiral: Summary\n\nThis is Merge Request is part of an task that is automated with ansible. This Merge Request is being raised to update the git sub-modules\n\n\n### :link: Links / References\n\n- Gitlab Job [6230864991](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6230864991)\n\n\n### :robot: Automation data\n\n``` json\n\n{\n \"gitmodules\": [\n {\n \"branch\": \"development\",\n \"current_commit\": \"e046f9ea49a617ce91ff2eda53b897f798dfb810)\",\n \"name\": \"gitlab-ci\",\n \"path\": \"/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci\",\n \"remote_head\": \"74ac15925c75ba0178ae21932b02b6a90a9169c3)\",\n \"remote_name\": \"origin\",\n \"url\": \"https://gitlab.com/nofusscomputing/projects/gitlab-ci.git\"\n }\n ]\n}\n\n```\n\nFor more information please see the [documentation](https://gitlab.com/nofusscomputing/projects/ansible/git_configuration)", "has_approval_rules": false, "id": 283850192, "iid": 10, "invalid_approvers_rules": [], "merge_request_approvers_available": true, "merge_status": "cannot_be_merged", "multiple_approval_rules_available": true, "project_id": 52098058, "require_password_to_approve": false, "state": "opened", "suggested_approvers": [], "title": "chore(gitlab-ci): Automated update of git sub-module", "updated_at": "2024-02-22T08:04:22.844Z", "user_can_approve": false, "user_has_approved": false } ``` Approve MR ```json "" ``` sub module details: ```json { "gitmodules": [ { "branch": "development", "current_commit": "e046f9ea49a617ce91ff2eda53b897f798dfb810)", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci", "remote_head": "74ac15925c75ba0178ae21932b02b6a90a9169c3)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } ] } ``` Git Status, prior to `git add` and `git commit` ``` text On branch automated-tasks Your branch is up to date with 'automation/development'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: .gitmodules modified: gitlab-ci (new commits) no changes added to commit (use "git add" and/or "git commit -a") ``` Merge the Merge Request return: ``` json {'message': 'Branch cannot be merged'} ``` other facts: ```json "ansible_facts": { "merge_request_approval_require_password": False, "merge_request_approved": True, "merge_request_needs_approval": 0, "merge_request_user_can_approve": False } ``` </details>
nfc_bot commented 2024-02-22 08:04:47 +00:00 (Migrated from gitlab.com)

added 10s of time spent

added 10s of time spent
nfc_bot commented 2024-02-22 08:34:38 +00:00 (Migrated from gitlab.com)

mentioned in commit a9849f9b00

mentioned in commit a9849f9b0051eb023af8902863e6d4082f650515
nfc_bot commented 2024-02-22 08:34:39 +00:00 (Migrated from gitlab.com)

added 1 commit

  • a9849f9b - chore(git): updated submodule gitlab-ci

Compare with previous version

added 1 commit <ul><li>a9849f9b - chore(git): updated submodule gitlab-ci</li></ul> [Compare with previous version](/nofusscomputing/projects/docker-bind/-/merge_requests/10/diffs?diff_id=932583267&start_sha=9f88f7814f9ffd064484e238b64be61e26c71bde)
nfc_bot commented 2024-02-22 08:35:00 +00:00 (Migrated from gitlab.com)

This automated job has auto_merge=True, As such this merge request will be merged.

Automation Data:

{
    "gitmodules": [
        {
            "branch": "development",
            "current_commit": "74ac15925c75ba0178ae21932b02b6a90a9169c3)",
            "name": "gitlab-ci",
            "path": "/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci",
            "remote_head": "c7c966bbee4fefc044d4c58e60dd5f10ec63862b)",
            "remote_name": "origin",
            "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
        }
    ]
}

This Merge request does not require approval.

This automated job has auto_merge=True, As such this merge request will be merged. :white_check_mark: - :link: Gitlab Job [6231108491](https://gitlab.com/nofusscomputing/projects/docker-bind/-/jobs/6231108491) <details><summary>Automation Data:</summary> ```json { "gitmodules": [ { "branch": "development", "current_commit": "74ac15925c75ba0178ae21932b02b6a90a9169c3)", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/docker-bind/_automation_/gitlab-ci", "remote_head": "c7c966bbee4fefc044d4c58e60dd5f10ec63862b)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } ] } ``` </details> This Merge request does not require approval. :white_check_mark:
nfc_bot (Migrated from gitlab.com) scheduled this pull request to auto merge when all checks succeed 2024-02-22 08:35:01 +00:00
nfc_bot commented 2024-02-22 08:35:24 +00:00 (Migrated from gitlab.com)

mentioned in commit eba720d9ea

mentioned in commit eba720d9eaa937f7d0e99cb15c65c8f05a30518a
nfc_bot (Migrated from gitlab.com) merged commit eba720d9ea into development 2024-02-22 08:35:24 +00:00
Sign in to join this conversation.
No Reviewers
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: docker/docker-bind#10
No description provided.