This script already checks each file's IMAGE_NAME for validity; this
adds essentially the same validation to check the HARDWARD_ID.
Also add the job to the ci-jobs groups, and set submodule-recursive
value for github-jenkins-cfg-verify.
Issue: RELENG-1418
Change-Id: I0266a0fcc276b2960c9c1749a89bc70e8115d152
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
jobs:
- gerrit-jenkins-cfg-merge
jobs:
- gerrit-jenkins-cfg-merge
+ - gerrit-jenkins-cfg-verify
- gerrit-jenkins-sandbox-cleanup
- gerrit-jjb-deploy-job
- gerrit-jjb-merge
- gerrit-jenkins-sandbox-cleanup
- gerrit-jjb-deploy-job
- gerrit-jjb-merge
jobs:
- github-jenkins-cfg-merge
jobs:
- github-jenkins-cfg-merge
+ - github-jenkins-cfg-verify
- github-jenkins-sandbox-cleanup
- github-jjb-deploy-job
- github-jjb-merge
- github-jenkins-sandbox-cleanup
- github-jjb-deploy-job
- github-jjb-merge
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
- submodule-recursive: '{submodule-recursive}'
+ submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
# Verifies that openstack contains an image for each config file defined in the
# jenkins-config/clouds/openstack directory.
# Verifies that openstack contains an image for each config file defined in the
# jenkins-config/clouds/openstack directory.
error=false
for file in jenkins-config/clouds/openstack/*/*; do
# Set the $IMAGE_NAME variable to the the file's IMAGE_NAME value
error=false
for file in jenkins-config/clouds/openstack/*/*; do
# Set the $IMAGE_NAME variable to the the file's IMAGE_NAME value
- export "$(grep IMAGE_NAME $file)"
+ export "$(grep ^IMAGE_NAME= $file)"
# The image should be listed as active
# The image should be listed as active
- openstack image list --property name="$IMAGE_NAME" | grep "active"
- if [ $? -ne 0 ]; then
+
+ if ! openstack image list --property name="$IMAGE_NAME" | grep "active"; then
echo "ERROR: No matching image found for $IMAGE_NAME"
error=true
fi
echo "ERROR: No matching image found for $IMAGE_NAME"
error=true
fi
+ # Set the $HARDWARE_ID variable to the the file's HARDWARE_ID value
+ export "$(grep ^HARDWARE_ID= $file)"
+ # The flavor should be listed. Spaces in grep string ensure complete match.
+
+ if ! openstack flavor list | grep " $HARDWARE_ID "; then
+ echo "ERROR: No matching flavor found for $HARDWARE_ID"
+ error=true
+ fi
-if [ "$error" = true ]; then