summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/mobile_devops.md5
-rw-r--r--doc/ci/pipelines/cicd_minutes.md11
-rw-r--r--doc/ci/runners/saas/macos/environment.md9
-rw-r--r--doc/ci/runners/saas/macos_saas_runner.md22
4 files changed, 17 insertions, 30 deletions
diff --git a/doc/ci/mobile_devops.md b/doc/ci/mobile_devops.md
index 175a63dc3b9..ab8fa0c9e6c 100644
--- a/doc/ci/mobile_devops.md
+++ b/doc/ci/mobile_devops.md
@@ -41,8 +41,7 @@ test:
### iOS build environments
-GitLab SaaS runners on macOS are currently available in beta. Follow the [instructions to request access](../ci/runners/saas/macos_saas_runner.md#access-request-process)
-for your project.
+[GitLab SaaS runners on macOS](../ci/runners/saas/macos_saas_runner.md) are currently available in beta.
After you are granted access to the beta macOS runners, [choose an image](../ci/runners/saas/macos/environment.md#available-images)
and add it to your `.gitlab-ci.yml` file.
@@ -271,7 +270,7 @@ For example:
script:
- fastlane build
tags:
- - shared-macos-amd64
+ - saas-macos-medium-m1
```
## Distribution
diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
index ee3f0d8c539..29d847ecd08 100644
--- a/doc/ci/pipelines/cicd_minutes.md
+++ b/doc/ci/pipelines/cicd_minutes.md
@@ -261,12 +261,13 @@ GitLab administrators can add a namespace to the reduced cost factor
GitLab SaaS runners have different cost factors, depending on the runner type (Linux, Windows, macOS) and the virtual machine configuration.
-| GitLab SaaS runner type | Machine Type | CI/CD minutes cost factor |
+| GitLab SaaS runner type | Machine Size | CI/CD minutes cost factor |
| :--------- | :------------------- | :--------- |
-| Linux OS | Small |1|
-| Linux OS | Medium |2|
-| Linux OS | Large |3|
-| Linux OS + GPU-enabled | Medium, GPU Standard |7|
+| Linux OS amd64 | small |1|
+| Linux OS amd64 | medium |2|
+| Linux OS amd64 | large |3|
+| Linux OS amd64 + GPU-enabled | medium, GPU standard |7|
+| macOS M1 | Medium |6|
### Monthly reset of CI/CD minutes
diff --git a/doc/ci/runners/saas/macos/environment.md b/doc/ci/runners/saas/macos/environment.md
index 7aa0f33fc59..2fad9bd4af2 100644
--- a/doc/ci/runners/saas/macos/environment.md
+++ b/doc/ci/runners/saas/macos/environment.md
@@ -17,14 +17,12 @@ Each time you run a job that requires tooling or dependencies not available in t
## VM types
-GitLab SaaS provides macOS build machines on Apple servers with Intel x86-64 processors.
-The expectation is that virtual machines running on the Apple M1 chip will be available in the second half of 2022.
-
-At this time there is only one available machine type offered, `shared-macos-amd64`.
+GitLab SaaS provides macOS build machines on Apple silicon (M1) chips.
+At this time there is only one available machine type offered, `saas-macos-medium-m1`. We deprecated Intel x86 runners in favor of Apple silicon. If you need to build for an x86 target, you can use Rosetta 2 to emulate an Intel x86 build environment.
| Instance type | vCPUS | Memory (GB) |
| --------- | --- | ------- |
-| `shared-macos-amd64` | 4 | 10 |
+| `saas-macos-medium-m1` | 6 | 8 |
## VM images
@@ -51,7 +49,6 @@ Each image is running a specific version of macOS and Xcode.
| VM image | Status | Included software |
|---------------------------|--------|--------------------|
-| `macos-10.13-xcode-7` | `frozen` | <https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/macstadium/orka/-/blob/main/toolchain/high-sierra.yml> |
| `macos-10.13-xcode-8` | `frozen` | <https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/macstadium/orka/-/blob/main/toolchain/high-sierra.yml> |
| `macos-10.13-xcode-9` | `frozen` | <https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/macstadium/orka/-/blob/main/toolchain/high-sierra.yml> |
| `macos-10.14-xcode-10` | `frozen` | <https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/macstadium/orka/-/blob/main/toolchain/mojave.yml> |
diff --git a/doc/ci/runners/saas/macos_saas_runner.md b/doc/ci/runners/saas/macos_saas_runner.md
index 20be2f2a147..9908495c9b4 100644
--- a/doc/ci/runners/saas/macos_saas_runner.md
+++ b/doc/ci/runners/saas/macos_saas_runner.md
@@ -12,30 +12,20 @@ SaaS runners on macOS provide an on-demand macOS build environment integrated wi
GitLab SaaS [CI/CD](../../../ci/index.md).
Use these runners to build, test, and deploy apps for the Apple ecosystem (macOS, iOS, tvOS). You can take advantage
of all the capabilities of the GitLab single DevOps platform and not have to manage or operate a
-build environment.
+build environment. Our [Mobile DevOps solution](../../../ci/mobile_devops.md#ios-build-environments) provides features, documentation, and guidance on building and deploying mobile applications for iOS.
Jobs handled by macOS shared runners on GitLab.com **time out after 3 hours**, regardless of the timeout configured in a project.
-## Access request process
-
-While in beta, to run CI jobs on the macOS runners, you must specify the GitLab SaaS customer personal or group [namespaces](../../../user/namespace/index.md) in the macOS `allow-list`. These are the namespaces that use the macOS runners.
-
-When you specify a personal or group namespace, the top level group is not added unless you specify it.
-
-After you add your namespace, you can use the macOS runners for any projects under the namespace you included.
-
-To request access, open an [access request](https://gitlab.com/gitlab-com/runner-saas-macos-limited-availability/-/issues/new).
-The expected turnaround for activation is two business days.
-
## Quickstart
-To start using SaaS runners on macOS, you must be an active GitLab SaaS Premium or Ultimate customer. Participants in the GitLab Open Source program are also eligible to use the service.
+To start using SaaS runners on macOS, you must be an active GitLab SaaS Premium or Ultimate customer.
### Configuring your pipeline
To start using the SaaS runners on macOS to run your CI jobs, you must configure your `.gitlab-ci.yml` file:
1. Add a `.gitlab-ci.yml` file to your project repository.
+1. Specify the tag `saas-macos-medium-m1`.
1. Specify the [image](macos/environment.md#vm-images) you want to use.
1. Commit a change to your repository.
@@ -48,8 +38,8 @@ The following sample `.gitlab-ci.yml` file shows how to start using the SaaS run
```yaml
.macos_saas_runners:
tags:
- - shared-macos-amd64
- image: macos-11-xcode-12
+ - saas-macos-medium-m1
+ image: macos-12-xcode-14
stages:
- build
@@ -74,7 +64,7 @@ test:
```
NOTE:
-You can specify a different Xcode image to run a job. To do so, replace the value for the `image` keyword with the value of the [virtual machine image name](macos/environment.md#vm-images) from the list of available images.
+You can specify a different Xcode image to run a job. To do so, replace the value for the `image` keyword with the value of the [virtual machine image name](macos/environment.md#vm-images) from the list of available images. The default value is our latest image.
## SaaS runners on macOS service level objective
View Lorry Controller Status