Merge "Revert "Test FN swift in base-test-swift""

playbooks/base-test/post-logs-swift.yaml

@@ -14,13 +14,12 @@
         zuul_log_cloud_config: '{{ item }}'
         zuul_log_partition: true
       with_random_choice:
-        - '{{ opendev_cloud_fn_one }}'
-        #- '{{ opendev_cloud_ovh_bhs1 }}'
-        #- '{{ opendev_cloud_ovh_gra1 }}'
-        #- '{{ opendev_cloud_rax_dfw }}'
-        #- '{{ opendev_cloud_rax_iad }}'
-        #- '{{ opendev_cloud_rax_ord }}'
-        #- '{{ opendev_cloud_vexxhost_ymq1 }}'
+        - '{{ opendev_cloud_ovh_bhs1 }}'
+        - '{{ opendev_cloud_ovh_gra1 }}'
+        - '{{ opendev_cloud_rax_dfw }}'
+        - '{{ opendev_cloud_rax_iad }}'
+        - '{{ opendev_cloud_rax_ord }}'
+        - '{{ opendev_cloud_vexxhost_ymq1 }}'
 
 - hosts: localhost
   # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail

zuul.d/jobs.yaml

@@ -112,13 +112,12 @@
       ara_compress_html: false
     nodeset: ubuntu-bionic
     secrets:
-      - opendev_cloud_fn_one
-      #- opendev_cloud_ovh_bhs1
-      #- opendev_cloud_ovh_gra1
-      #- opendev_cloud_rax_dfw
-      #- opendev_cloud_rax_iad
-      #- opendev_cloud_rax_ord
-      #- opendev_cloud_vexxhost_ymq1
+      - opendev_cloud_ovh_bhs1
+      - opendev_cloud_ovh_gra1
+      - opendev_cloud_rax_dfw
+      - opendev_cloud_rax_iad
+      - opendev_cloud_rax_ord
+      - opendev_cloud_vexxhost_ymq1
 
 - job:
     name: base-minimal

zuul.d/secrets.yaml

@@ -232,47 +232,3 @@
       profile: rackspace
       auth: *rax_auth
       region_name: IAD
-
-
-- secret:
-    name: opendev_cloud_fn_one
-    data:
-      region_name: regionOne
-      auth:
-        auth_url: https://openstack.fortnebula.com:13000/v3
-        username: !encrypted/pkcs1-oaep
-          - ryaRb19rcTo7kqqNPxXgyOs4qhPXP9/kkTR3M5LICPUeOdxUC8936eCEIc9W/bZFieGzP
-            DJfiSFHwHLAl1lv6kR7oqwPvK6Tix7xNy+xFjkoUOPnH/3YDHtqnrjU2/nR8hb78WhL8J
-            phs7WoLl3GeRQHqtB1HUTr54skwfo4ty/h0a6LggbxC0ruezHSwLf1t5OPXv20n1o22n/
-            4O8vDXnuxT+Pn3yaQOPtGSBpFAjOCimOBCNw2vDBdL+XOpVYu2keU27zFUnhptQ4i5ZLS
-            sm/33A7b5EbAbjiLdLui1JvpDxWlFl6tAiKb6/qDuTnl8PvnYozjaU+I9NJ586V2yeREb
-            iOIyX2fsVUa+zdf/d+pWE82fTuLMYCALNhfMBr5RDHNPgUwOaxxVBitFTGOgdDIgUWPPP
-            K00N3yByP16QVdTVOEc49iHfMbo48DiWq/daZHbLj8jF7mr/wHuQVlnXTL93bxMcRYwbP
-            SikRM+vNA5/2taXHTaj3GGVhashNTri08aiiNGPhrzGmDgGU4EyfelD8vth9BvBbwplgv
-            iz7K5a1z7XHNSmgQCppXhdiFyfWt/HIMlDKXlE2idgcEnzaIToNcjZl6XnFPehfDrgyw1
-            7LjwsRhkiWQ6Yie0UHT0EIcLBSfNhGHXDK4NZcv+OjyklESc32rccmzVUbwlo8=
-        password: !encrypted/pkcs1-oaep
-          - nxVxvs54TLG2xWECCXf4vSqRGd/xJr3iZnRLHzCE6ITqliL0o4lSD4vmdbqXiAg+BG+qF
-            LQd+Nfsd37dFQWi655pUyN4s4SolItsQUQLcxUHjBj7yXgi8OyF2aHzEtZdMdmu8Ro9P2
-            drHyWZqTjGKYp3TWJCZTkPwQlYGHPiGcEvbNGjmpZBzqwB6SbGV+YyBQ4r7LOyBxKB9/0
-            naBy+8DtxZ9tRUWMP/MJSxf7QlylXfMT+eYZTvTs4IQsxjfjdowuf6vJdKeK4Kwnwa6h2
-            EyNVjeEme3O7uRIsJgwyLynCOq/iMiyiJeCMTRrw9VrLhchiLAYApLpAMpqxB2qxxG2i2
-            1FMctDfZdTqJjyqcjpUwrlZ7HvcCYs2MI4ejtXn4ldmgRZGDzCGya0gR24JmG+VJyOebu
-            VY8GN+KGn/IZ9G9aEIiMf/TG+bbeY7NnhIiBymgvjo2eavDCzrgYS3agp011dt/wgFi5W
-            ZSpqMld24VrTBaLL7BvOSxs/yrld3d495PtOWu69S3Rot9hr2ncZVnYYCCa6MHoGqVfx/
-            nUKjjpvh86ycvjvd5J0tFsttHltG/6/bhuQz8qB2qcjil48ltI/qyBoZB9JNuQi1nt577
-            6gP0Bp2/BlBVsvJKxVshdvEQf2GdjKxsvFvAmLChmRk43GvnBI3betX7znAkQ4=
-        project_name: !encrypted/pkcs1-oaep
-          - HbRuwLmtPtzCeraSrkwnT3DTgPfeCbuxPr4Q5RD2t4c9zYd4E+IsVus2Zv8yvGtlA76oL
-            LGkGtc+wngB/0AGooRxZ1O2y/1kXee98HQDvvoMvdZazAidLbUb+LZLLJU1KTerEpRpZw
-            Pv1VCU2pCtfx3MEYSMzk3wjSnFBhh3AHrIG6CTkJBKwxMjkOxO+qjYayjVHk8Y7iN3dJl
-            NO5wyP9HGxl86STEz5VHgUUE7deywSlyexDFS/sshgeUV8KhLGg0ENSxESRLow8bhy0Jj
-            9HJ8ATELLRWiWQuGodUgwh5JEK/5zJ+eVZZS7mQ9HegZO2NhkpV5fQocgKtmJKnpOSoIE
-            l5Y9vf/hAMcdfS1Pjefli3MV9lEAvmGxkgoVLmOEGtyeonwwz1Dni7hdRRPS0pRtNe8g6
-            eaqFS51UsUZzt53Ce3bAwmDKMdt1PtCOfOEBNoccqdcflssxVTi2ae6rbu0GVYA7Stbpp
-            sXhQtP8rfpZRrg5vlwrHp6pilBhtTN2DvVXSWWtN9rLQkEDVQRYcEDOcDRVX7Wo8uRdo+
-            1uO0pm8ov9nDiEWqYv+kemzOK1+LZPo8mCdfcOitrh+TVeMnqEi53/Ycqi1WLGlsztWuI
-            HpmuxRDJolalknlH2PqDWbO5ALZFzxL9lHI6PTiMk1OPDn0ZKU9UV3cDkEHCxQ=
-        project_domain_name: Default
-        user_domain_name: Default
-      identity_api_version: 3