Merge branch 'master' into theopenlab/openlab#211

Author: mrhillsman

README.md

@@ -8,23 +8,6 @@ jobs definitions into this repo firstly.
 If this is first time you come to OpenLab, please start with OpenLab
 [Getting Started](https://docs.openlabtesting.org/publications/).
 
-Jobs naming notations
----------------------
-To unify the jobs name format, we have the following naming notations:
-
-    {project}-{test type}-{backend}-{service}
-
-- The *project* usually is the name of the git repo which contains tests to run.
-- The *test type* is the type of tests to run, e.g. acceptance tests, unit test.
-- The *backend* is the test environment provider, default is `Devstack`, optionally.
-- The *service* is the specific OpenStack service which this job will run against,
-  optionally.
-
-For an example, the job definition about running the specific Trove related
-acceptance tests of terraform-provider-openstack repo can be named as:
-
-    terraform-provider-openstack-acceptance-test-trove
-
 More information
 ----------------
 Web page about OpenLab:

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

@@ -127,37 +127,29 @@
     - name: Run image build and publish for cloud-provider-openstack
       shell:
         cmd: |
-          # NOTE(flaper87): Export these variables
-          # before setting -x and -e to avoid leaking
-          # sensitive data.
-          # NOTE(mrhillsman): Credentials still were leaking
-          # so removing the export unless absolutely needed
-          # and setting the login earlier instead of using Makefile
-          # https://github.com/kubernetes/cloud-provider-openstack/blob/master/Makefile#L255
-          #export DOCKER_USERNAME={{dockerhub.username}}
-          #export DOCKER_PASSWORD={{dockerhub.password}}
-          docker login -u {{dockerhub.username}} -p {{dockerhub.password}}
-          export REGISTRY=docker.io/k8scloudprovider
-          export VERSION=latest
-
-          set -x
-          set -e
-          set -o pipefail
-
-          if [ '{{ zuul.pipeline }}' != 'periodic' ]; then
-              exit 0;
+          if [ '{{ zuul.pipeline }}' == 'periodic' ] && [ '{{ zuul.branch }}' == 'master' ]; then
+            export LOG_DIR='{{ k8s_log_dir }}'
+            docker login -u {{dockerhub.username}} -p {{dockerhub.password}}
+            export REGISTRY=docker.io/k8scloudprovider
+            export VERSION=latest
+
+            set -x
+            set -e
+            set -o pipefail
+
+            make images 2>&1 | tee $LOG_DIR/image-build-upload.log
+
+            docker push ${REGISTRY}/openstack-cloud-controller-manager:${VERSION} | tee $LOG_DIR/image-build-upload.log
+            docker push ${REGISTRY}/cinder-flex-volume-driver:${VERSION} | tee $LOG_DIR/image-build-upload.log
+            docker push ${REGISTRY}/cinder-provisioner:${VERSION} | tee $LOG_DIR/image-build-upload.log
+            docker push ${REGISTRY}/cinder-csi-plugin:${VERSION} | tee $LOG_DIR/image-build-upload.log
+            docker push ${REGISTRY}/k8s-keystone-auth:${VERSION} | tee $LOG_DIR/image-build-upload.log
+            docker push ${REGISTRY}/octavia-ingress-controller:${VERSION} | tee $LOG_DIR/image-build-upload.log
+            docker push ${REGISTRY}/manila-provisioner:${VERSION} | tee $LOG_DIR/image-build-upload.log
+          else
+            exit 0;
           fi
 
-          make images 2>&1 | tee $LOG_DIR/image-build-upload.log
-
-          docker push ${REGISTRY}/openstack-cloud-controller-manager:${VERSION} | tee $LOG_DIR/image-build-upload.log
-          docker push ${REGISTRY}/cinder-flex-volume-driver:${VERSION} | tee $LOG_DIR/image-build-upload.log
-          docker push ${REGISTRY}/cinder-provisioner:${VERSION} | tee $LOG_DIR/image-build-upload.log
-          docker push ${REGISTRY}/cinder-csi-plugin:${VERSION} | tee $LOG_DIR/image-build-upload.log
-          docker push ${REGISTRY}/k8s-keystone-auth:${VERSION} | tee $LOG_DIR/image-build-upload.log
-          docker push ${REGISTRY}/octavia-ingress-controller:${VERSION} | tee $LOG_DIR/image-build-upload.log
-          docker push ${REGISTRY}/manila-provisioner:${VERSION} | tee $LOG_DIR/image-build-upload.log
-
         executable: /bin/bash
         chdir: '{{ k8s_os_provider_src_dir }}'
       environment: '{{ global_env }}'

playbooks/kind-integration-test-arm64/post.yaml

@@ -1,9 +1,8 @@
 - hosts: all
-  roles:
-    #- export-kind-gcp-account
+  # TODO create a role export-kind-gcp-account and add here
   become: yes
   tasks:
-    - name: #TODO Upload E2E conformance test result to kubernetes testgrid
+    - name: Upload conformance test result to testgrid
       shell:
         cmd: |
           set -e

roles/config-golang/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-go_version: '1.11.1'
+go_version: '1.12.1'
 go_tarball: 'go{{ go_version }}.linux-amd64.tar.gz'
 go_download_location: 'https://storage.googleapis.com/golang/{{ go_tarball }}'

roles/create-devstack-local-conf/tasks/main.yml

@@ -8,6 +8,7 @@
       [[local|localrc]]
       NETWORK_GATEWAY=10.0.0.1
       enable_plugin neutron git://git.openstack.org/openstack/neutron
+      SWIFT_LOOPBACK_DISK_SIZE=10G
       EOF
     executable: /bin/bash
 
@@ -159,7 +160,6 @@
       set -e
       set -x
       cat << EOF >> /tmp/dg-local.conf
-      enable_service designate,designate-central,designate-api,designate-pool-manager,designate-zone-manager,designate-mdns
       enable_plugin designate git://git.openstack.org/openstack/designate
       EOF
     executable: /bin/bash

zuul.d/jobs.yaml

@@ -10,7 +10,7 @@
       doesn't validate the node and does not generate an ARA report.
       These tasks, if required, can be included by the dependant jobs
       themselves on a need basis.
-    attempts: 1
+    attempts: 2
     pre-run: playbooks/base/pre.yaml
     post-run:
       - playbooks/base/post-ssh.yaml
@@ -309,6 +309,8 @@
     parent: cloud-provider-openstack-test
     description: |
       Run Kubernetes E2E Conformance tests against Kubernetes master
+    vars:
+      go_version: '1.12.1'
     run: playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/run.yaml
     post-run: playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/post.yaml
     secrets:
@@ -322,6 +324,7 @@
     description: |
       Run Kubernetes E2E Conformance tests against Kubernetes v1.10
     vars:
+      go_version: '1.9.3'
       k8s_version: 'release-1.10'
 
 - job:
@@ -330,6 +333,7 @@
     description: |
       Run Kubernetes E2E Conformance tests against Kubernetes v1.11
     vars:
+      go_version: '1.10.3'
       k8s_version: 'release-1.11'
 
 - job:
@@ -338,6 +342,7 @@
     description: |
       Run Kubernetes E2E Conformance tests against Kubernetes v1.12
     vars:
+      go_version: '1.10.8'
       k8s_version: 'release-1.12'
 
 - job:
@@ -346,6 +351,7 @@
     description: |
       Run Kubernetes E2E Conformance tests against Kubernetes v1.13
     vars:
+      go_version: '1.11.5'
       k8s_version: 'release-1.13'
 
 - job:
@@ -354,6 +360,7 @@
     description: |
       Run Kubernetes E2E Conformance tests against Kubernetes v1.14
     vars:
+      go_version: '1.12.1'
       k8s_version: 'release-1.14'
 
 - job:

zuul.d/nodesets.yaml

@@ -41,3 +41,9 @@
     nodes:
       - name: ubuntu-xenial-huaweicloud
         label: ubuntu-xenial-huaweicloud
+
+- nodeset:
+    name: ubuntu-xenial-gpu
+    nodes:
+      - name: ubuntu-xenial-gpu
+        label: ubuntu-xenial-gpu

zuul.d/pipelines.yaml

@@ -174,9 +174,13 @@
         status: 'failure'
       mysql:
 
+# NOTES: Deprecated, don't accept any new jobs, but please don't remove it,
+#        some outside projects refer name "periodic" in repository.
 - pipeline:
     name: periodic
-    description: Jobs in this queue are triggered on a timer. UTC-0 04:00, 09:00 and 16:00
+    description: |
+      Deprecated.
+      Jobs in this queue are triggered on a timer. UTC-0 04:00, 09:00 and 16:00
     manager: independent
     precedence: low
     trigger:
@@ -188,28 +192,88 @@
       mysql:
 
 - pipeline:
-    name: periodic-2
-    description: Jobs in this queue are triggered on a timer. UTC-0 22:00
+    name: periodic-0/12
+    description: |
+      Jobs in this queue are triggered on a timer. UTC-0 00:00 and 12:00
     manager: independent
-    precedence: low
+    precedence: high
     trigger:
       timer:
-        - time: '0 22 * * *'
+        - time: '0 0,12 * * *'
     success:
       mysql:
     failure:
       mysql:
 
 - pipeline:
-    name: merge-check
-    description: >
-      Each time a change merges, this pipeline verifies that all open changes
-      on the same project are still mergeable.
-    failure-message: Build failed (merge-check pipeline).
+    name: periodic-2/14
+    description: |
+      Jobs in this queue are triggered on a timer. UTC-0 02:00 and 14:00
     manager: independent
-    ignore-dependencies: true
-    precedence: low
-    trigger: {}
+    precedence: high
+    trigger:
+      timer:
+        - time: '0 2,14 * * *'
+    success:
+      mysql:
+    failure:
+      mysql:
+
+- pipeline:
+    name: periodic-4/16
+    description: |
+      Jobs in this queue are triggered on a timer. UTC-0 04:00 and 16:00
+    manager: independent
+    precedence: high
+    trigger:
+      timer:
+        - time: '0 4,16 * * *'
+    success:
+      mysql:
+    failure:
+      mysql:
+
+- pipeline:
+    name: periodic-6/18
+    description: |
+      Jobs in this queue are triggered on a timer. UTC-0 06:00 and 18:00
+    manager: independent
+    precedence: high
+    trigger:
+      timer:
+        - time: '0 6,18 * * *'
+    success:
+      mysql:
+    failure:
+      mysql:
+
+- pipeline:
+    name: periodic-8/20
+    description: |
+      Jobs in this queue are triggered on a timer. UTC-0 08:00 and 20:00
+    manager: independent
+    precedence: high
+    trigger:
+      timer:
+        - time: '0 8,20 * * *'
+    success:
+      mysql:
+    failure:
+      mysql:
+
+- pipeline:
+    name: periodic-10/22
+    description: |
+      Jobs in this queue are triggered on a timer. UTC-0 10:00 and 22:00
+    manager: independent
+    precedence: high
+    trigger:
+      timer:
+        - time: '0 10,22 * * *'
+    success:
+      mysql:
+    failure:
+      mysql:
 
 - pipeline:
     name: recheck-designate