Skip to content

Commit c338dd9

Browse files
committed
CI: Use skc-ci-aio user for aio jobs
This user only has read-only access to the package and container repositories, so is safer than using the release-train-ci user which has read/write permissions. For the container image build job we can use the skc-ci-aio user to access the package repositories, but must use the release-train-ci user to push container images.
1 parent 4837c8d commit c338dd9

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@ resolv_is_managed: false
1919
# Build and deploy the development Pulp service repositories.
2020
# Use Ark's package repositories to install packages.
2121
stackhpc_repo_mirror_url: "{{ stackhpc_release_pulp_url }}"
22-
stackhpc_repo_mirror_username: "{{ stackhpc_docker_registry_username }}"
23-
stackhpc_repo_mirror_password: "{{ stackhpc_docker_registry_password }}"
22+
stackhpc_repo_mirror_username: "skc-ci-aio"
23+
stackhpc_repo_mirror_password: !vault |
24+
$ANSIBLE_VAULT;1.1;AES256
25+
31386366383365666135336331663635396237623139306362633933636233613765663731666338
26+
3633633736333936383439623066653663333964343234350a393137383537316164323837386437
27+
36613139323161643766666565643739373037623363636234343965343436653261326238393566
28+
3837336661653962340a316631366463623138623530373133336665376433633437306631383666
29+
30333461333535363433363336663664316634343432633766346564323833346663
2430
2531
# Build and deploy released Pulp repository versions.
2632
stackhpc_repo_centos_stream_baseos_version: "{{ stackhpc_pulp_repo_centos_stream_8_baseos_version }}"
@@ -75,13 +81,5 @@ stackhpc_include_os_minor_version_in_repo_url: true
7581
# Host and port of container registry.
7682
# Push built images to the development Pulp service registry.
7783
stackhpc_docker_registry: "{{ stackhpc_repo_mirror_url | regex_replace('^https?://', '') }}"
78-
79-
# Username and password of container registry.
80-
stackhpc_docker_registry_username: "release-train-ci"
81-
stackhpc_docker_registry_password: !vault |
82-
$ANSIBLE_VAULT;1.1;AES256
83-
38356134376436656165303634626531653836366233383531343439646433376334396438373735
84-
3135643664353934356237376134623235356137383263300a333165386562396134633534376532
85-
34386133383366326639353432386235336132663839333337323739633434613934346462363031
86-
3265323831663964360a643962346231386462323236373963633066393736323234303833363535
87-
3664
84+
stackhpc_docker_registry_username: "{{ stackhpc_repo_mirror_username }}"
85+
stackhpc_docker_registry_password: "{{ stackhpc_repo_mirror_password }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,14 @@ resolv_is_managed: false
4444
# Build against the development Pulp service repositories.
4545
# Use Ark's package repositories to install packages.
4646
stackhpc_repo_mirror_url: "{{ stackhpc_repo_mirror_auth_proxy_url if stackhpc_repo_mirror_auth_proxy_enabled | bool else stackhpc_release_pulp_url }}"
47-
stackhpc_repo_mirror_username: "{{ stackhpc_docker_registry_username }}"
48-
stackhpc_repo_mirror_password: "{{ stackhpc_docker_registry_password }}"
47+
stackhpc_repo_mirror_username: "skc-ci-aio"
48+
stackhpc_repo_mirror_password: !vault |
49+
$ANSIBLE_VAULT;1.1;AES256
50+
31386366383365666135336331663635396237623139306362633933636233613765663731666338
51+
3633633736333936383439623066653663333964343234350a393137383537316164323837386437
52+
36613139323161643766666565643739373037623363636234343965343436653261326238393566
53+
3837336661653962340a316631366463623138623530373133336665376433633437306631383666
54+
30333461333535363433363336663664316634343432633766346564323833346663
4955
5056
# Build against released Pulp repository versions.
5157
stackhpc_repo_centos_stream_baseos_version: "{{ stackhpc_pulp_repo_centos_stream_8_baseos_version }}"

0 commit comments

Comments
 (0)