Rearrange pipeline configuration (contributes to IBM-Blockchain#71)

Signed-off-by: Simon Stone <[email protected]>

azure-pipelines.yml

@@ -32,6 +32,12 @@ steps:
       ibmcloud plugin list
       curl -sSL https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.3/linux/oc.tar.gz | sudo tar xzf - -C /usr/local/bin
     displayName: Install IBM Cloud and OpenShift CLI
+  - script: |
+      set -ex
+      ibmcloud login --apikey $(IBM Cloud API Key) -c $(IBM Cloud Account) -r $(IBM Cloud Region)
+      ibmcloud oc cluster config -c $(IBM Cloud OpenShift Cluster ID)
+      oc login -u apikey -p $(IBM Cloud API Key)
+    displayName: Log in to IBM Cloud
   - script: ansible-galaxy collection build
     displayName: Build collection artifact
   - script: |
@@ -53,13 +59,6 @@ steps:
       shellcheck tutorial/*.sh
       yamllint .
     displayName: Lint collection
-  - script: |
-      set -ex
-      ibmcloud login --apikey $(IBM Cloud API Key) -c $(IBM Cloud Account) -r $(IBM Cloud Region)
-      ibmcloud oc cluster config -c $(IBM Cloud OpenShift Cluster ID)
-      oc login -u apikey -p $(IBM Cloud API Key)
-    # condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-    displayName: Log in to IBM Cloud
   - script: |
       set -ex
       cd ~/.ansible/collections/ansible_collections/ibm/blockchain_platform
@@ -73,7 +72,6 @@ steps:
       yq -yi .test_run_id=\"${TEST_RUN_ID}\" tests/integration/integration_config.yml
       yq -yi .short_test_run_id=\"${SHORT_TEST_RUN_ID}\" tests/integration/integration_config.yml
       ansible-test integration
-    # condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     displayName: Run tests
   - script: |
       set -ex