jobs: Rename CENTOS_ARCH to OS_ARCH

OS_ARCH is more meaningful than CENTOS_ARCH as it can either be the
architecture of the reserved host or the architecture for the platform
against which the RPM builds are created.

jobs/nightly-samba-builds.yml

@@ -31,7 +31,7 @@
           default: '{os_version}'
           description: Platform to build the RPMS
       - string:
-          name: CENTOS_ARCH
+          name: OS_ARCH
           default: '{os_arch}'
           description: Architecture to build the RPMS
       - string:
@@ -77,7 +77,7 @@
     - shell: !include-raw-escape: scripts/common/scp.sh
     - shell: |
         #!/bin/bash
-        jobs/scripts/common/bootstrap.sh $WORKSPACE/jobs/scripts/nightly-samba-builds/nightly-samba-builds.sh "ghprbPullId=$ghprbPullId ghprbTargetBranch=$ghprbTargetBranch OS_VERSION=$OS_VERSION OS_ARCH=$CENTOS_ARCH SAMBA_BRANCH=$SAMBA_BRANCH"
+        jobs/scripts/common/bootstrap.sh $WORKSPACE/jobs/scripts/nightly-samba-builds/nightly-samba-builds.sh "ghprbPullId=$ghprbPullId ghprbTargetBranch=$ghprbTargetBranch OS_VERSION=$OS_VERSION OS_ARCH=$OS_ARCH SAMBA_BRANCH=$SAMBA_BRANCH"
 
     publishers:
     - email-ext:

jobs/scripts/common/get-node.sh

@@ -12,9 +12,9 @@ client:
 EOF
 
 if [[ "${JOB_NAME}" =~ rpms ]]; then
-	POOL_MATCH="^(virt-ec2)(.*)(centos-${CENTOS_VERSION}-${CENTOS_ARCH})$"
+	POOL_MATCH="^(virt-ec2)(.*)(centos-${CENTOS_VERSION}-${OS_ARCH})$"
 else
-	POOL_MATCH="^(metal-ec2)(.*)(centos-${CENTOS_VERSION}-${CENTOS_ARCH})$"
+	POOL_MATCH="^(metal-ec2)(.*)(centos-${CENTOS_VERSION}-${OS_ARCH})$"
 fi
 
 readarray -t POOLS < <(duffy client list-pools | jq -r '.pools[].name')