Skip to content

Commit 21b8ef4

Browse files
dirkmuellerdirkmueller
authored
Merge pull request #3151 from SUSE/user_update
Update user lists
2 parents e2f2b9e + d9761ee commit 21b8ef4

5 files changed

Lines changed: 29 additions & 38 deletions

File tree

‎.github/workflows/update-deployment-branches.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ jobs:
9090
PULL_REQUEST_BRANCH: ${{ env.DEPLOYMENT_BRANCH_NAME }}
9191
PULL_REQUEST_TITLE: "🤖: Update build recipes for ${{ env.OS_VERSION_PRETTY }}"
9292
PULL_REQUEST_UPDATE: 1
93-
PULL_REQUEST_REVIEWERS: "fcrozat PVlasin dirkmueller"
93+
PULL_REQUEST_REVIEWERS: "alexandrevicenzi dirkmueller"
9494
if: env.no_change != 'true'

‎src/staging/project_setup.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
USERS_FOR_PRODUCTION = [
1010
"avicenzi",
1111
"dirkmueller",
12-
"favogt",
13-
"fcrozat",
14-
"pvlasin",
1512
"pushman",
1613
]
1714

‎tests/test_bot.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ async def test_load_from_env(
4040
assert await StagingBot.from_env_file() == bot
4141

4242

43-
_osc_user = "defolos"
43+
_osc_user = "testuser"
4444

4545

4646
@pytest.mark.parametrize(
4747
"comment,bot",
4848
[
4949
(
50-
"""Created a staging project on OBS for 16.0: [home:defolos:BCI:Staging:16.0:16.0-AVeMj](https://build.opensuse.org/project/show/home:defolos:BCI:Staging:16.0:16.0-AVeMj)
50+
"""Created a staging project on OBS for 16.0: [home:testuser:BCI:Staging:16.0:16.0-AVeMj](https://build.opensuse.org/project/show/home:testuser:BCI:Staging:16.0:16.0-AVeMj)
5151
Changes pushed to branch [`16.0-AVeMj`](https://github.com/SUSE/BCI-dockerfile-generator/tree/16.0-AVeMj)""",
5252
StagingBot(
5353
os_version=OsVersion.SL16_0,
@@ -56,7 +56,7 @@ async def test_load_from_env(
5656
),
5757
),
5858
(
59-
"""Created a staging project on OBS for Tumbleweed: [home:defolos:BCI:Staging:Tumbleweed:tumbleweed-EqgiS](https://build.opensuse.org/project/show/home:defolos:BCI:Staging:Tumbleweed:tumbleweed-EqgiS)
59+
"""Created a staging project on OBS for Tumbleweed: [home:testuser:BCI:Staging:Tumbleweed:tumbleweed-EqgiS](https://build.opensuse.org/project/show/home:testuser:BCI:Staging:Tumbleweed:tumbleweed-EqgiS)
6060
Changes pushed to branch [`tumbleweed-EqgiS`](https://github.com/SUSE/BCI-dockerfile-generator/tree/tumbleweed-EqgiS)""",
6161
StagingBot(
6262
os_version=OsVersion.TUMBLEWEED,
@@ -65,7 +65,7 @@ async def test_load_from_env(
6565
),
6666
),
6767
(
68-
"""Created a staging project on OBS for 7: [home:defolos:BCI:Staging:SLE-15-SP7:sle15-sp7-OZGYa](https://build.opensuse.org/project/show/home:defolos:BCI:Staging:SLE-15-SP7:sle15-sp7-OZGYa)
68+
"""Created a staging project on OBS for 7: [home:testuser:BCI:Staging:SLE-15-SP7:sle15-sp7-OZGYa](https://build.opensuse.org/project/show/home:testuser:BCI:Staging:SLE-15-SP7:sle15-sp7-OZGYa)
6969
Changes pushed to branch [`sle15-sp7-OZGYa`](https://github.com/SUSE/BCI-dockerfile-generator/tree/sle15-sp7-OZGYa)""",
7070
StagingBot(
7171
os_version=OsVersion.SP7,

‎tests/test_build_results.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
def test_from_resultlist():
1212
obs_api_reply = """<resultlist state="10c966b3d96474d1d59d0ba6d4d5b61a">
13-
<result project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL" repository="images" arch="x86_64" code="building" state="building" dirty="true">
13+
<result project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL" repository="images" arch="x86_64" code="building" state="building" dirty="true">
1414
<status package="golang-1.18" code="building">
1515
<details>building on old-cirrus2:14</details>
1616
</status>
@@ -25,26 +25,26 @@ def test_from_resultlist():
2525
</status>
2626
<status package="micro" code="scheduled"/>
2727
</result>
28-
<result project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL" repository="images" arch="aarch64" code="building" state="building">
28+
<result project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL" repository="images" arch="aarch64" code="building" state="building">
2929
<status package="openjdk-11" code="succeeded"/>
3030
<status package="openjdk-11-devel" code="building">
3131
<details>building on obs-arm-10:29</details>
3232
</status>
3333
<status package="python-3.6" code="succeeded"/>
3434
<status package="python-3.9" code="signing"/>
3535
</result>
36-
<result project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL" repository="containerfile" arch="x86_64" code="published" state="published" dirty="true">
36+
<result project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL" repository="containerfile" arch="x86_64" code="published" state="published" dirty="true">
3737
<status package="openjdk-11" code="excluded"/>
3838
<status package="openjdk-11-devel" code="excluded"/>
3939
</result>
40-
<result project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL" repository="containerfile" arch="aarch64" code="published" state="published">
40+
<result project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL" repository="containerfile" arch="aarch64" code="published" state="published">
4141
</result>
4242
</resultlist>
4343
4444
"""
4545
assert RepositoryBuildResult.from_resultlist(obs_api_reply) == [
4646
RepositoryBuildResult(
47-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
47+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
4848
repository="images",
4949
arch=Arch.X86_64,
5050
code="building",
@@ -75,7 +75,7 @@ def test_from_resultlist():
7575
],
7676
),
7777
RepositoryBuildResult(
78-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
78+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
7979
repository="images",
8080
arch=Arch.AARCH64,
8181
code="building",
@@ -98,7 +98,7 @@ def test_from_resultlist():
9898
],
9999
),
100100
RepositoryBuildResult(
101-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
101+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
102102
repository="containerfile",
103103
arch=Arch.X86_64,
104104
code="published",
@@ -113,7 +113,7 @@ def test_from_resultlist():
113113
],
114114
),
115115
RepositoryBuildResult(
116-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
116+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
117117
repository="containerfile",
118118
arch=Arch.AARCH64,
119119
code="published",
@@ -127,7 +127,7 @@ def test_is_build_failed_dirty_repo():
127127
is_build_failed(
128128
[
129129
RepositoryBuildResult(
130-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
130+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
131131
repository="containerfile",
132132
arch=Arch.AARCH64,
133133
code="published",
@@ -146,7 +146,7 @@ def test_is_build_failed_dirty_repo():
146146
(
147147
[
148148
RepositoryBuildResult(
149-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
149+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
150150
repository="containerfile",
151151
arch=Arch.AARCH64,
152152
code="published",
@@ -163,7 +163,7 @@ def test_is_build_failed_dirty_repo():
163163
(
164164
[
165165
RepositoryBuildResult(
166-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
166+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
167167
repository="containerfile",
168168
arch=Arch.AARCH64,
169169
code="published",
@@ -178,7 +178,7 @@ def test_is_build_failed_dirty_repo():
178178
(
179179
[
180180
RepositoryBuildResult(
181-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
181+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
182182
repository="containerfile",
183183
arch=Arch.AARCH64,
184184
code="published",
@@ -207,7 +207,7 @@ def test_is_build_failed(build_res: list[RepositoryBuildResult], is_failed: bool
207207
(
208208
[
209209
RepositoryBuildResult(
210-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
210+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
211211
repository="containerfile",
212212
arch=Arch.AARCH64,
213213
code="published",
@@ -227,12 +227,12 @@ def test_is_build_failed(build_res: list[RepositoryBuildResult], is_failed: bool
227227
<details>
228228
<summary>Build Results</summary>
229229
230-
Repository `containerfile` in [home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL](https://build.opensuse.org/project/show/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL) for `aarch64`: current state: published
230+
Repository `containerfile` in [home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL](https://build.opensuse.org/project/show/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL) for `aarch64`: current state: published
231231
Build results:
232232
package name | status | build log
233233
-------------|--------|----------
234-
init | ✅ succeeded | [live log](https://build.opensuse.org/package/live_build_log/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/init/containerfile/aarch64)
235-
micro | ⛔ excluded | [live log](https://build.opensuse.org/package/live_build_log/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/micro/containerfile/aarch64)
234+
init | ✅ succeeded | [live log](https://build.opensuse.org/package/live_build_log/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/init/containerfile/aarch64)
235+
micro | ⛔ excluded | [live log](https://build.opensuse.org/package/live_build_log/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/micro/containerfile/aarch64)
236236
237237
238238
</details>
@@ -243,7 +243,7 @@ def test_is_build_failed(build_res: list[RepositoryBuildResult], is_failed: bool
243243
(
244244
[
245245
RepositoryBuildResult(
246-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
246+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
247247
repository="containerfile",
248248
arch=Arch.AARCH64,
249249
code="published",
@@ -264,12 +264,12 @@ def test_is_build_failed(build_res: list[RepositoryBuildResult], is_failed: bool
264264
<details>
265265
<summary>Build Results</summary>
266266
267-
Repository `containerfile` in [home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL](https://build.opensuse.org/project/show/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL) for `aarch64`: current state: building (repository is **dirty**)
267+
Repository `containerfile` in [home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL](https://build.opensuse.org/project/show/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL) for `aarch64`: current state: building (repository is **dirty**)
268268
Build results:
269269
package name | status | detail | build log
270270
-------------|--------|--------|----------
271-
init | ❌ failed | | [live log](https://build.opensuse.org/package/live_build_log/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/init/containerfile/aarch64)
272-
micro | 🚫 unresolvable | Nothing provides gcc | [live log](https://build.opensuse.org/package/live_build_log/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/micro/containerfile/aarch64)
271+
init | ❌ failed | | [live log](https://build.opensuse.org/package/live_build_log/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/init/containerfile/aarch64)
272+
micro | 🚫 unresolvable | Nothing provides gcc | [live log](https://build.opensuse.org/package/live_build_log/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/micro/containerfile/aarch64)
273273
274274
275275
</details>
@@ -280,7 +280,7 @@ def test_is_build_failed(build_res: list[RepositoryBuildResult], is_failed: bool
280280
(
281281
[
282282
RepositoryBuildResult(
283-
project="home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
283+
project="home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL",
284284
repository="containerfile",
285285
arch=Arch.AARCH64,
286286
code="published",
@@ -300,12 +300,12 @@ def test_is_build_failed(build_res: list[RepositoryBuildResult], is_failed: bool
300300
<details>
301301
<summary>Build Results</summary>
302302
303-
Repository `containerfile` in [home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL](https://build.opensuse.org/project/show/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL) for `aarch64`: current state: published
303+
Repository `containerfile` in [home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL](https://build.opensuse.org/project/show/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL) for `aarch64`: current state: published
304304
Build results:
305305
package name | status | detail | build log
306306
-------------|--------|--------|----------
307-
init | ❌ failed | | [live log](https://build.opensuse.org/package/live_build_log/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/init/containerfile/aarch64)
308-
micro | 🚫 unresolvable | Nothing provides rust | [live log](https://build.opensuse.org/package/live_build_log/home:defolos:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/micro/containerfile/aarch64)
307+
init | ❌ failed | | [live log](https://build.opensuse.org/package/live_build_log/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/init/containerfile/aarch64)
308+
micro | 🚫 unresolvable | Nothing provides rust | [live log](https://build.opensuse.org/package/live_build_log/home:testuser:BCI:Staging:SLE-15-SP3:sle15-sp3-NBdNL/micro/containerfile/aarch64)
309309
310310
311311
</details>

‎tests/test_project_setup.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
This project is automatically updated from git. Please do **not** send submit requests, create an issue in the [bci-dockerfile-generator](https://github.com/SUSE/bci-dockerfile-generator) repository instead</description>
2222
<person userid="avicenzi" role="maintainer"/>
2323
<person userid="dirkmueller" role="maintainer"/>
24-
<person userid="favogt" role="maintainer"/>
25-
<person userid="fcrozat" role="maintainer"/>
26-
<person userid="pvlasin" role="maintainer"/>
2724
<person userid="pushman" role="maintainer"/>
2825
2926
<build>
@@ -121,9 +118,6 @@
121118
This project is automatically updated from git. Please do **not** send submit requests, create an issue in the [bci-dockerfile-generator](https://github.com/SUSE/bci-dockerfile-generator) repository instead</description>
122119
<person userid="avicenzi" role="maintainer"/>
123120
<person userid="dirkmueller" role="maintainer"/>
124-
<person userid="favogt" role="maintainer"/>
125-
<person userid="fcrozat" role="maintainer"/>
126-
<person userid="pvlasin" role="maintainer"/>
127121
<person userid="pushman" role="maintainer"/>
128122
129123
<build>

0 commit comments

Comments
 (0)