Fix the opentelekomcloud job (apache#64)

* Fix the opentelekomcloud job

- Add the OS_VPC_ID environment variable
- Change the OS_FLAVOR_ID and OS_FLAVOR_ID_RESIZE value
- Enable all the tests running

For apache#63

* Update run.yaml

* change to use an ubuntu image for testing

* add az environment variable for otc job

playbooks/terraform-provider-opentelekomcloud-acceptance-test-opentelekomcloud/run.yaml

@@ -17,35 +17,36 @@
           export OS_USERNAME="`echo {{ opentelekomcloud_credentials.user_name }}`"
           export OS_ACCESS_KEY="`echo {{ opentelekomcloud_credentials.access_key }}`"
           export OS_SECRET_KEY="`echo {{ opentelekomcloud_credentials.secret_key }}`"
+          export OS_AVAILABILITY_ZONE="`echo {{ opentelekomcloud_credentials.availability_zone }}`"
 
           set -o pipefail
           set -x
           export OS_SHARE_NETWORK_ID="foobar"
-          export OS_FLAVOR_ID_RESIZE=2
-          export OS_FLAVOR_ID=1
+          export OS_FLAVOR_ID_RESIZE='computev2-1'
+          export OS_FLAVOR_ID='computev1-1'
           export OS_POOL_NAME="admin_external_net"
-          # export OS_EXTGW_ID="$(openstack network show $OS_POOL_NAME -f value -c id)"
           export OS_EXTGW_ID=`openstack network list -f value |grep admin_external_net | awk -F ' ' '{print $1}'`
-          export OS_IMAGE_NAME="cirros-0.3.5-x86_64-disk"
-          export OS_IMAGE_ID="$(openstack image show $OS_IMAGE_NAME -f value -c id)"
-          if [ -z "$OS_IMAGE_ID" ]; then
-              curl -O http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
-              export OS_IMAGE_ID="$(openstack image create --file ./cirros-0.3.5-x86_64-disk.img --min-disk 1 --container-format bare --disk-format raw cirros-0.3.5-x86_64-disk -f value -c id)"
-              rm cirros-0.3.5-x86_64-disk.img
-          fi
+          export OS_IMAGE_NAME=Community_Ubuntu_16.04_TSI_latest
+          export OS_IMAGE_ID=d6944a41-5ec7-44a4-970e-ce330da390d2
           _NET_PREFIX="terraform-provider-opentelekomcloud"
           export OS_NETWORK_NAME="$_NET_PREFIX-net"
           export OS_NETWORK_ID="$(openstack network show $OS_NETWORK_NAME -f value -c id)"
           if [ -z "$OS_NETWORK_ID" ]; then
               export OS_NETWORK_ID="$(openstack network create $OS_NETWORK_NAME -f value -c id)"
               openstack subnet create --network $OS_NETWORK_ID --subnet-range 10.0.20.0/24 $_NET_PREFIX-subnet
           fi
-
+          export OS_VPC_ID="$(openstack router show $_NET_PREFIX-vpc -f value -c id)"
+          if [ -z "$OS_VPC_ID" ]; then
+              export OS_VPC_ID="$(openstack router create $_NET_PREFIX-vpc -f value -c id)"
+              openstack router add subnet $_NET_PREFIX-vpc $_NET_PREFIX-subnet
+          fi
           export OS_SWIFT_ENVIRONMENT=1
+
           # Run except the DNS/FW/LB test 100 testcases at a time
-          testcases=`go test github.com/gator1/terraform-provider-opentelekomcloud/opentelekomcloud/ -v -list 'Acc'`
+          testcases=`go test ./opentelekomcloud/ -v -list 'Acc'`
           testcases=`echo "$testcases" | sed '$d' | grep -v -e FW -e LB`
-          # echo "$testcases" | xargs -t -n100 sh -c 'TF_ACC=1 go test github.com/gator1/terraform-provider-opentelekomcloud/opentelekomcloud/ -v -timeout 120m -run $(echo "$@" | tr " " "|")' argv0 2>&1 | tee $TEST_RESULTS_TXT
+          echo "$testcases" | xargs -t -n100 sh -c 'TF_ACC=1 go test ./opentelekomcloud/ -v -timeout 120m -run $(echo "$@" | tr " " "|")' argv0 2>&1 | tee $TEST_RESULTS_TXT
+
         executable: /bin/bash
         chdir: '{{ zuul.project.src_dir }}'
       environment: '{{ golang_env }}'

zuul.d/secrets.yaml

@@ -272,3 +272,14 @@
           1eAK6me9p/N3Dc2Zm2SVeUghgKf7Isx6FoReM2CaaESRy5rr3zUTW7U5oSvD18frQ4JzZ
           iCspQ2lATLbaNt/Tqc+zbUBBgaGMzVTHqNGvKIKM71n3z4iOhc4g2yFJC0OZrSTNB8XPI
           9ADKvexYHPvHAGtN2OwfvY9feJ+pBwTyOLqoBq5RTy27nhIHMIIrSxr3UO/EN4=
+      availability_zone: !encrypted/pkcs1-oaep
+        - MgIiAe78I9a5g0rm0YVYC+CKm4PJionzfQpDbIycvhNgxv4toODVbzQJfZct4x9n00Q69
+          EvFGsPNZ/3ng5hilViD9mYngwDPYJ/kMA/pJfDUcgCfPXnzuIaA8l7OjUh9Zfgn9OFj0k
+          /Thr+kw4Y4Lvb7GyW+8vglp9pl7I9MOboWExFptlxZbclLwTuHQy5fHeDXuhiOm/JDGVS
+          ynQyI7dqonDnsslBOKe2RYeB8N4RkJTXWnAhYUCGji1EKjC1hfCzKZLHjZhbUfvH8WTpZ
+          VG/lTeySTLFa6f+HFDd/dhytKm1505yMu9d++RXtsGqPDf7yGjlDY6DkLv0ltk/W3GgPs
+          ne2plFA1FUbx5TB/fGwfSzBzaj7l+gAoeZxGrJls3h7mWVSbuJeS81r+rLI2B+/dN+nmF
+          dy1uXghMbEO7HpLTKK+l6kME6jeYvYS3bPCHeTuXOZsOE6/6cA4gtk859vmWR2PCZnket
+          0d3NITHStrv/FGFOxEHFkXRUk1grcn5bEGYW8dnBkMRO1HErhSe0j9Zq8zNJ+GTq7W7m3
+          iCqOrAERYOsoWTiof0RGjCPYKykb9VWBBTRNYjmy1UjwNtAYcbkXhwZ4JubjjUuGfKYjS
+          ALzExwAbHMmnTPfpF0MsnOoewaeBKSkmtTLTr79t+xxKuLqkCavr/6tFjOENRE=