[CPO] added new bucket

playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/post.yaml

@@ -35,4 +35,8 @@
           # upload e2e log to google storage, python 3.7 is needed.
           python3.7 upload_e2e.py --junit=$LOG_DIR/junit*.xml --log=$LOG_DIR/e2e.log \
               --bucket=gs://k8s-conformance-openstack/$PIPELINE_LOGS_DIR/ci-'{{ zuul.job }}' \
-              --key-file='{{ hostvars[inventory_hostname]["gcp_key_file"] }}'
+              --key-file='{{ hostvars[inventory_hostname]["gcp_key_file"] }}'
+
+          python3.7 upload_e2e.py --junit=$LOG_DIR/junit*.xml --log=$LOG_DIR/e2e.log \
+              --bucket=gs://k8s-conform-provider-openstack/$PIPELINE_LOGS_DIR/ci-'{{ zuul.job }}' \
+              --key-file='{{ hostvars[inventory_hostname]["gcp_cpo_key_file"] }}'

roles/export-gcp-account/tasks/main.yaml

@@ -9,3 +9,17 @@
       echo '{{ gcp_account.key_json }}' > '{{ hostvars[inventory_hostname]["gcp_key_file"] }}'
     executable: /bin/bash
   no_log: yes
+
+# NOTE(chrigl): Secret for new bucket. Will replace the old one when everything works.
+# See https://github.com/kubernetes/k8s.io/issues/1311#issuecomment-778507615
+- name: Set google account key file path for cpo
+  set_fact:
+    gcp_cpo_key_file: '/tmp/gcp_cpo_key.json'
+  no_log: yes
+
+- name: Save google account key file for cpo
+  shell:
+    cmd: |
+      echo '{{ gcp_account_cpo.key_json }}' > '{{ hostvars[inventory_hostname]["gcp_cpo_key_file"] }}'
+    executable: /bin/bash
+  no_log: yes

zuul.d/jobs.yaml

@@ -534,6 +534,7 @@
       - citynetwork_credentials
       - kubeconfig
       - gcp_account
+      - gcp_account_cpo
       - swr
     vars:
       k8s_os_provider_src_dir: '{{ ansible_user_dir }}/src/k8s.io/cloud-provider-openstack'
@@ -594,6 +595,7 @@
     secrets:
       - citynetwork_credentials
       - gcp_account
+      - gcp_account_cpo
       - swr
 
 - job:

zuul.d/secrets.yaml

@@ -555,6 +555,64 @@
           i1CHNp6XeHQUQbSaKR3waD6zBd5N5bbivkyXDFCHM13uypYz3yR1SM7mDIhINK/7q0gLN
           9nfZ+cz7uT7lpVakShkZiBG/X+XEtxw1kGWdEvi+E9nwfIPS3XSUXvreFVcoGw=
 
+
+# Google cloud account info for the new bucket gs://k8s-conform-provider-openstack
+# See https://github.com/kubernetes/k8s.io/issues/1311#issuecomment-778507615
+- secret:
+    name: gcp_account_cpo
+    data:
+      key_json: !encrypted/pkcs1-oaep
+        - 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
+
 # HuaweiCloud SWR service
 - secret:
     name: swr