From 12fc98387ac102bb8531abb62c0ae7f20a590479 Mon Sep 17 00:00:00 2001 From: Filipe Nascimento Date: Mon, 5 May 2025 13:46:33 +0200 Subject: [PATCH 1/4] Edit runner_job_execution_status_enum.rb --- app/graphql/types/ci/runner_job_execution_status_enum.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/graphql/types/ci/runner_job_execution_status_enum.rb b/app/graphql/types/ci/runner_job_execution_status_enum.rb index 421e1758536ccf..fbe36698497988 100644 --- a/app/graphql/types/ci/runner_job_execution_status_enum.rb +++ b/app/graphql/types/ci/runner_job_execution_status_enum.rb @@ -7,13 +7,11 @@ class RunnerJobExecutionStatusEnum < BaseEnum value 'IDLE', description: "Runner is idle.", - value: :idle, - experiment: { milestone: '15.7' } + value: :idle value 'ACTIVE', description: 'Runner is busy.', - value: :active, - experiment: { milestone: '17.2' } + value: :active end end end -- GitLab From 633ea87ea50acd50c6b18dc808ae1e403240cc0a Mon Sep 17 00:00:00 2001 From: Filipe Nascimento Date: Mon, 5 May 2025 14:08:31 +0200 Subject: [PATCH 2/4] JobExecutionStatus - Remove experiment status from api reference. --- doc/api/graphql/reference/_index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/api/graphql/reference/_index.md b/doc/api/graphql/reference/_index.md index 25b9507eecdb49..65caeaff9ff30b 100644 --- a/doc/api/graphql/reference/_index.md +++ b/doc/api/graphql/reference/_index.md @@ -23154,7 +23154,7 @@ CI/CD variables for a project. | `ephemeralRegisterUrl` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 15.11. **Status**: Experiment. URL of the registration page of the runner manager. Only available for the creator of the runner for a limited time during registration. | | `groups` | [`GroupInterfaceConnection`](#groupinterfaceconnection) | Groups the runner is associated with. For group runners only. (see [Connections](#connections)) | | `id` | [`CiRunnerID!`](#cirunnerid) | ID of the runner. | -| `jobExecutionStatus` {{< icon name="warning-solid" >}} | [`CiRunnerJobExecutionStatus`](#cirunnerjobexecutionstatus) | **Introduced** in GitLab 15.7. **Status**: Experiment. Job execution status of the runner. | +| `jobExecutionStatus` | [`CiRunnerJobExecutionStatus`](#cirunnerjobexecutionstatus) | Job execution status of the runner. | | `locked` | [`Boolean`](#boolean) | Indicates the runner is locked. | | `maintenanceNote` | [`String`](#string) | Runner's maintenance notes. | | `maintenanceNoteHtml` | [`String`](#string) | GitLab Flavored Markdown rendering of `maintenance_note`. | @@ -23333,7 +23333,7 @@ Returns [`[CiRunnerCloudProvisioningStep!]`](#cirunnercloudprovisioningstep). | `executorName` | [`String`](#string) | Executor last advertised by the runner. | | `id` | [`CiRunnerManagerID!`](#cirunnermanagerid) | ID of the runner manager. | | `ipAddress` | [`String`](#string) | IP address of the runner manager. | -| `jobExecutionStatus` {{< icon name="warning-solid" >}} | [`CiRunnerJobExecutionStatus`](#cirunnerjobexecutionstatus) | **Introduced** in GitLab 16.3. **Status**: Experiment. Job execution status of the runner manager. | +| `jobExecutionStatus` | [`CiRunnerJobExecutionStatus`](#cirunnerjobexecutionstatus) | Job execution status of the runner manager. | | `platformName` | [`String`](#string) | Platform provided by the runner manager. | | `revision` | [`String`](#string) | Revision of the runner. | | `runner` | [`CiRunner`](#cirunner) | Runner configuration for the runner manager. | @@ -42817,8 +42817,8 @@ Runner cloud provider. | Value | Description | | ----- | ----------- | -| `ACTIVE` {{< icon name="warning-solid" >}} | **Introduced** in GitLab 17.2. **Status**: Experiment. Runner is busy. | -| `IDLE` {{< icon name="warning-solid" >}} | **Introduced** in GitLab 15.7. **Status**: Experiment. Runner is idle. | +| `ACTIVE` | Runner is busy. | +| `IDLE` | Experiment. Runner is idle. | ### `CiRunnerMembershipFilter` -- GitLab From 0cc2ed112f7ca13cfae76cc1274233085daed3c4 Mon Sep 17 00:00:00 2001 From: Filipe Nascimento Date: Mon, 5 May 2025 14:13:21 +0200 Subject: [PATCH 3/4] JobExecutionStatus - Remove experiment status from api reference. --- doc/api/graphql/reference/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/graphql/reference/_index.md b/doc/api/graphql/reference/_index.md index 65caeaff9ff30b..be2e954c55dee3 100644 --- a/doc/api/graphql/reference/_index.md +++ b/doc/api/graphql/reference/_index.md @@ -42818,7 +42818,7 @@ Runner cloud provider. | Value | Description | | ----- | ----------- | | `ACTIVE` | Runner is busy. | -| `IDLE` | Experiment. Runner is idle. | +| `IDLE` | Runner is idle. | ### `CiRunnerMembershipFilter` -- GitLab From 220a81515f5fc6d9d9e1c467dbebf1454c994fbc Mon Sep 17 00:00:00 2001 From: Filipe Nascimento Date: Mon, 5 May 2025 16:28:23 +0200 Subject: [PATCH 4/4] Remove experiment status from CiRunnerJobExecutionStatus in GraphqQL --- app/graphql/types/ci/runner_job_execution_status_enum.rb | 1 - app/graphql/types/ci/runner_manager_type.rb | 3 +-- app/graphql/types/ci/runner_type.rb | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/graphql/types/ci/runner_job_execution_status_enum.rb b/app/graphql/types/ci/runner_job_execution_status_enum.rb index fbe36698497988..986783bc9abce5 100644 --- a/app/graphql/types/ci/runner_job_execution_status_enum.rb +++ b/app/graphql/types/ci/runner_job_execution_status_enum.rb @@ -8,7 +8,6 @@ class RunnerJobExecutionStatusEnum < BaseEnum value 'IDLE', description: "Runner is idle.", value: :idle - value 'ACTIVE', description: 'Runner is busy.', value: :active diff --git a/app/graphql/types/ci/runner_manager_type.rb b/app/graphql/types/ci/runner_manager_type.rb index c1b374756b0d54..de593719b694bd 100644 --- a/app/graphql/types/ci/runner_manager_type.rb +++ b/app/graphql/types/ci/runner_manager_type.rb @@ -27,8 +27,7 @@ class RunnerManagerType < BaseObject field :job_execution_status, Types::Ci::RunnerJobExecutionStatusEnum, null: true, - description: 'Job execution status of the runner manager.', - experiment: { milestone: '16.3' } + description: 'Job execution status of the runner manager.' field :platform_name, GraphQL::Types::String, null: true, description: 'Platform provided by the runner manager.', method: :platform diff --git a/app/graphql/types/ci/runner_type.rb b/app/graphql/types/ci/runner_type.rb index c400f41d91c339..f0185072948fa0 100644 --- a/app/graphql/types/ci/runner_type.rb +++ b/app/graphql/types/ci/runner_type.rb @@ -61,8 +61,7 @@ class RunnerType < BaseObject field :job_execution_status, Types::Ci::RunnerJobExecutionStatusEnum, null: true, - description: 'Job execution status of the runner.', - experiment: { milestone: '15.7' } + description: 'Job execution status of the runner.' field :jobs, ::Types::Ci::JobInterface.connection_type, null: true, description: 'Jobs assigned to the runner. This field can only be resolved for one runner in any single request.', authorize: :read_builds, -- GitLab