Skip to content

Commit 44737da

Browse files
committed
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.
1 parent 54330aa commit 44737da

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

jobs/nightly-samba-builds.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
default: '{os_version}'
3232
description: Platform to build the RPMS
3333
- string:
34-
name: CENTOS_ARCH
34+
name: OS_ARCH
3535
default: '{os_arch}'
3636
description: Architecture to build the RPMS
3737
- string:
@@ -77,7 +77,7 @@
7777
- shell: !include-raw-escape: scripts/common/scp.sh
7878
- shell: |
7979
#!/bin/bash
80-
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"
80+
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"
8181
8282
publishers:
8383
- email-ext:

jobs/scripts/common/get-node.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ client:
1212
EOF
1313

1414
if [[ "${JOB_NAME}" =~ rpms ]]; then
15-
POOL_MATCH="^(virt-ec2)(.*)(centos-${CENTOS_VERSION}-${CENTOS_ARCH})$"
15+
POOL_MATCH="^(virt-ec2)(.*)(centos-${CENTOS_VERSION}-${OS_ARCH})$"
1616
else
17-
POOL_MATCH="^(metal-ec2)(.*)(centos-${CENTOS_VERSION}-${CENTOS_ARCH})$"
17+
POOL_MATCH="^(metal-ec2)(.*)(centos-${CENTOS_VERSION}-${OS_ARCH})$"
1818
fi
1919

2020
readarray -t POOLS < <(duffy client list-pools | jq -r '.pools[].name')

0 commit comments

Comments
 (0)