chore: remove registry secret from zuul jobs

also fix horizon manila-ui branch name issue
vexxhost · Dec 17, 2024 · 71eeaff · 71eeaff
1 parent bf6d312
commit 71eeaff
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git a/images/horizon/Dockerfile b/images/horizon/Dockerfile
@@ -15,7 +15,7 @@ ADD --keep-git-dir=true https://opendev.org/openstack/ironic-ui.git#unmaintained
 RUN git -C /src/ironic-ui fetch --unshallow
 ADD --keep-git-dir=true https://opendev.org/openstack/magnum-ui.git#unmaintained/2023.1 /src/magnum-ui
 RUN git -C /src/magnum-ui fetch --unshallow
-ADD --keep-git-dir=true https://opendev.org/openstack/manila-ui.git#stable/2023.1 /src/manila-ui
+ADD --keep-git-dir=true https://opendev.org/openstack/manila-ui.git#unmaintained/2023.1 /src/manila-ui
 RUN git -C /src/manila-ui fetch --unshallow
 ADD --keep-git-dir=true https://opendev.org/openstack/neutron-vpnaas-dashboard.git#unmaintained/2023.1 /src/neutron-vpnaas-dashboard
 RUN git -C /src/neutron-vpnaas-dashboard fetch --unshallow

diff --git a/images/nova/Dockerfile b/images/nova/Dockerfile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+# Atmosphere-Rebuild-Time: 2024-12-17T01:27:44Z
 
 ARG RELEASE
 

diff --git a/zuul.d/container-images/base.yaml b/zuul.d/container-images/base.yaml
@@ -47,21 +47,13 @@
     abstract: true
     irrelevant-files:
       - ^doc/
-    secrets:
-      name: container_registry_credentials
-      secret: atmosphere-harbor-credentials
-      pass-to-parent: true
     vars: *image_vars
 
 - job:
     name: atmosphere-promote-container-image
     parent: ci-promote-container-image
     irrelevant-files:
       - ^doc/
-    secrets:
-      name: container_registry_credentials
-      secret: atmosphere-harbor-credentials
-      pass-to-parent: true
     nodeset:
       nodes: []
     vars: *image_vars
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
@@ -12,23 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- secret:
-    name: atmosphere-harbor-credentials
-    data:
-      harbor.atmosphere.dev:
-        username: robot$zuul
-        password: !encrypted/pkcs1-oaep
-          - OOykjodZE21qsYYLpzplp+PV0QbsKQ1B3+kI7bY97VQI/d5RlewqlNABc10eQnyYFSDvq
-            z2gSigSHxaVcV5qKJLTNVDgzSBHBj349OaTh6dXsxplvoArehfYMMZGuNmFlucoeN8K6w
-            yLRViN7tCS39CAYdjeNX1X7mQ7gBC61jUQ++JB+R5MhXmALJxzPfQRl9jsYmjx9ZXjEwE
-            tjKLSyQifQU20eXbhZOUW2nr+ItTikS3AOSo6Ja6jCI1c9lj6mJtUOorGsuxfdhEigPws
-            Qnz539imGcyqySSxvbJvgoEYxhE3dHFV5cJkomoHHHwLH0wbjAgBQtCMX3CvpxNX8sBfJ
-            MxvUkxY8VWt3CtJkdq+/eaCovCRn6GN5enI5tlUJgpAyV+PO6PvkTan6yC8lHMM5pD4jX
-            Hdo6gt6m9WyA5VxUHdoYYMaDO/rvCxxrUevzPn8do5I96madr9S9lFARqw74mgXG5I6pZ
-            M7zDXnorUFyv9dUIB2rOZrp7o0OC2thujjDTKXb4qfmfXGOwlkNmtCLo6BaDo9pSdRN8p
-            k0YnUAItZ64qUR7paEUKGy4rzsZjDYvIj7DrCFvLL2CXcyjPGcmcblpSHe5vJ15CFVH8X
-            o39FIIhSmehvrYJziGYUgf4JY1B6ktBtFc9l78WeoJRHNce+viSSkBj1fhbUaI=
-
 - secret:
     name: ansible_galaxy_info
     data: