Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2024-01-20 06:10:50 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2024-01-20 06:10:50 +0300
commitc78aaf1503a47c32cafc2418faf6702e51d05ad3 (patch)
tree24f4577c540cee312eddcc047906bccf5a35ab8c /doc/ci
parentc0bc64e25edb4d7c3ac1d89de720f94782be5d2e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/img/dsm_secret_import_1.pngbin63596 -> 0 bytes
-rw-r--r--doc/ci/img/dsm_secret_import_2.pngbin82715 -> 0 bytes
-rw-r--r--doc/ci/img/dsm_secrets.pngbin77732 -> 0 bytes
-rw-r--r--doc/ci/img/gitlab_build_result_1.pngbin121167 -> 0 bytes
-rw-r--r--doc/ci/img/gitlab_build_result_2.pngbin90368 -> 0 bytes
-rw-r--r--doc/ci/img/gitlab_build_result_3.pngbin183867 -> 0 bytes
-rw-r--r--doc/ci/secrets/fortanix_dsm_integration.md12
-rw-r--r--doc/ci/secrets/img/dsm_secret_import_1.pngbin0 -> 19818 bytes
-rw-r--r--doc/ci/secrets/img/dsm_secret_import_2.pngbin0 -> 27080 bytes
-rw-r--r--doc/ci/secrets/img/dsm_secrets.pngbin0 -> 26996 bytes
-rw-r--r--doc/ci/secrets/img/gitlab_build_result_1.pngbin0 -> 42664 bytes
-rw-r--r--doc/ci/secrets/img/gitlab_build_result_2.pngbin0 -> 30932 bytes
-rw-r--r--doc/ci/secrets/img/gitlab_build_result_3.pngbin0 -> 63618 bytes
13 files changed, 6 insertions, 6 deletions
diff --git a/doc/ci/img/dsm_secret_import_1.png b/doc/ci/img/dsm_secret_import_1.png
deleted file mode 100644
index fd0b6f612f5..00000000000
--- a/doc/ci/img/dsm_secret_import_1.png
+++ /dev/null
Binary files differ
diff --git a/doc/ci/img/dsm_secret_import_2.png b/doc/ci/img/dsm_secret_import_2.png
deleted file mode 100644
index b1657affcd8..00000000000
--- a/doc/ci/img/dsm_secret_import_2.png
+++ /dev/null
Binary files differ
diff --git a/doc/ci/img/dsm_secrets.png b/doc/ci/img/dsm_secrets.png
deleted file mode 100644
index 0c4e687e519..00000000000
--- a/doc/ci/img/dsm_secrets.png
+++ /dev/null
Binary files differ
diff --git a/doc/ci/img/gitlab_build_result_1.png b/doc/ci/img/gitlab_build_result_1.png
deleted file mode 100644
index 43169c5ed91..00000000000
--- a/doc/ci/img/gitlab_build_result_1.png
+++ /dev/null
Binary files differ
diff --git a/doc/ci/img/gitlab_build_result_2.png b/doc/ci/img/gitlab_build_result_2.png
deleted file mode 100644
index 5bc34740be8..00000000000
--- a/doc/ci/img/gitlab_build_result_2.png
+++ /dev/null
Binary files differ
diff --git a/doc/ci/img/gitlab_build_result_3.png b/doc/ci/img/gitlab_build_result_3.png
deleted file mode 100644
index 3c3727ef9ce..00000000000
--- a/doc/ci/img/gitlab_build_result_3.png
+++ /dev/null
Binary files differ
diff --git a/doc/ci/secrets/fortanix_dsm_integration.md b/doc/ci/secrets/fortanix_dsm_integration.md
index 06758510196..2b6a37086a5 100644
--- a/doc/ci/secrets/fortanix_dsm_integration.md
+++ b/doc/ci/secrets/fortanix_dsm_integration.md
@@ -130,9 +130,9 @@ To generate a new secret in Fortanix DSM and use it with GitLab:
If not, select **Build > Pipelines > Run pipeline**.
1. Go to **Build > Jobs** and check the `build` job's log:
- - ![gitlab_build_result_1](../img/gitlab_build_result_1.png)
+ - ![gitlab_build_result_1](img/gitlab_build_result_1.png)
-![dsm_secrets](../img/dsm_secrets.png)
+![dsm_secrets](img/dsm_secrets.png)
## Use an existing secret from Fortanix DSM
@@ -140,7 +140,7 @@ To use a secret that already exists in Fortanix DSM with GitLab:
1. The secret must be marked as exportable in Fortanix:
- ![dsm_secret_import_1](../img/dsm_secret_import_1.png)
+ ![dsm_secret_import_1](img/dsm_secret_import_1.png)
1. In GitLab, go to your project.
1. Go to **Settings > CI/CD > Variables**, and add these variables:
@@ -170,7 +170,7 @@ To use a secret that already exists in Fortanix DSM with GitLab:
If not, select **Build > Pipelines > Run pipeline**.
1. Go to **Build > Jobs** and check the `build` job's log:
- - ![gitlab_build_result_2](../img/gitlab_build_result_2.png)
+ - ![gitlab_build_result_2](img/gitlab_build_result_2.png)
## Code Signing
@@ -179,7 +179,7 @@ To set up code signing securely in your GitLab environment:
1. Log in to your Fortanix DSM account.
1. Import `keystore_password` and `key_password` as secrets in Fortanix DSM. Ensure that they are marked as exportable.
- ![dsm_secret_import_2](../img/dsm_secret_import_2.png)
+ ![dsm_secret_import_2](img/dsm_secret_import_2.png)
1. In GitLab, go to your project.
1. Go to **Settings > CI/CD > Variables**, and add these variables:
@@ -219,4 +219,4 @@ To set up code signing securely in your GitLab environment:
If not, select **Build > Pipelines > Run pipeline**.
1. Go to **Build > Jobs** and check the `build` job's log:
- - ![gitlab_build_result_3](../img/gitlab_build_result_3.png)
+ - ![gitlab_build_result_3](img/gitlab_build_result_3.png)
diff --git a/doc/ci/secrets/img/dsm_secret_import_1.png b/doc/ci/secrets/img/dsm_secret_import_1.png
new file mode 100644
index 00000000000..edf8c3a0590
--- /dev/null
+++ b/doc/ci/secrets/img/dsm_secret_import_1.png
Binary files differ
diff --git a/doc/ci/secrets/img/dsm_secret_import_2.png b/doc/ci/secrets/img/dsm_secret_import_2.png
new file mode 100644
index 00000000000..abb45092cd0
--- /dev/null
+++ b/doc/ci/secrets/img/dsm_secret_import_2.png
Binary files differ
diff --git a/doc/ci/secrets/img/dsm_secrets.png b/doc/ci/secrets/img/dsm_secrets.png
new file mode 100644
index 00000000000..ea4083426ed
--- /dev/null
+++ b/doc/ci/secrets/img/dsm_secrets.png
Binary files differ
diff --git a/doc/ci/secrets/img/gitlab_build_result_1.png b/doc/ci/secrets/img/gitlab_build_result_1.png
new file mode 100644
index 00000000000..7867291e519
--- /dev/null
+++ b/doc/ci/secrets/img/gitlab_build_result_1.png
Binary files differ
diff --git a/doc/ci/secrets/img/gitlab_build_result_2.png b/doc/ci/secrets/img/gitlab_build_result_2.png
new file mode 100644
index 00000000000..a4966eec145
--- /dev/null
+++ b/doc/ci/secrets/img/gitlab_build_result_2.png
Binary files differ
diff --git a/doc/ci/secrets/img/gitlab_build_result_3.png b/doc/ci/secrets/img/gitlab_build_result_3.png
new file mode 100644
index 00000000000..f0a7a891038
--- /dev/null
+++ b/doc/ci/secrets/img/gitlab_build_result_3.png
Binary files differ