diff options
| -rw-r--r-- | docker/scripts/lib_csit.sh | 3 | ||||
| m--------- | global-jjb | 0 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg | 2 | ||||
| -rwxr-xr-x | jjb/scripts/backup_upload_archives.sh | 25 |
4 files changed, 11 insertions, 19 deletions
diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh index 221c1edb..6c064d0a 100644 --- a/docker/scripts/lib_csit.sh +++ b/docker/scripts/lib_csit.sh @@ -63,6 +63,9 @@ csit_install_packages() { local branchname="$(echo $branch | sed -e 's,/,_,')" local csit_dir="$DOCKER_CSIT_DIR" local csit_ansible_dir="$csit_dir/fdio.infra.ansible" + if [ ! -d "$csit_ansible_dir" ] ; then + csit_ansible_dir="$csit_dir/resources/tools/testbed-setup/ansible" + fi local bld_log="$DOCKER_BUILD_LOG_DIR/$FDIOTOOLS_IMAGENAME" bld_log="${bld_log}-$branchname-csit_install_packages-bld.log" diff --git a/global-jjb b/global-jjb -Subproject e5840e0c645226926475e6dfabd9f16606325ab +Subproject c8b9acd166fcbd88139a65f7721e522980a0e01 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index f0c8fad1..1a871279 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -1,4 +1,4 @@ -# Cloud Configuration +# OpenStack Cloud Configuration CLOUD_CREDENTIAL_ID=fdiovex-ci CLOUD_URL=https://auth.vexxhost.net/v3 CLOUD_IGNORE_SSL=false diff --git a/jjb/scripts/backup_upload_archives.sh b/jjb/scripts/backup_upload_archives.sh index 0599c967..8d6a8f49 100755 --- a/jjb/scripts/backup_upload_archives.sh +++ b/jjb/scripts/backup_upload_archives.sh @@ -159,30 +159,19 @@ if __name__ == u"__main__": END_OF_PYTHON_SCRIPT WS_ARCHIVES_DIR="$WORKSPACE/archives" -ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER" -ARCHIVES_ZIP_FILE="$WORKSPACE/.archives/archives.zip" +JENKINS_BUILD_ARCHIVE_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER" TMP_ARCHIVES_DIR="/tmp/archives" mkdir -p $TMP_ARCHIVES_DIR pushd $TMP_ARCHIVES_DIR -if [ -f "$ARCHIVES_ZIP_FILE" ]; then - # FIXME: this branch to be removed upon full transition to lftools: - # we are include_raw from fdio-infra-shiplogs publisher, and - # it already packed everything into archives.zip and removed - # the original archives directory. So just unpack and use that. - echo "Detected existing archives.zip, uploading the contents of it" - unzip "$ARCHIVES_ZIP_FILE" +mkdir -p $JENKINS_BUILD_ARCHIVE_DIR +if [ -e "$WS_ARCHIVES_DIR" ]; then + echo "Found $WS_ARCHIVES_DIR, uploading its contents" + cp -r $WS_ARCHIVES_DIR/* $JENKINS_BUILD_ARCHIVE_DIR else - # the include_raw is done from fdio-infra-publish publisher - mkdir -p "$ARCHIVES_DIR" - if [ -e "$WS_ARCHIVES_DIR" ]; then - echo "Found $WS_ARCHIVES_DIR, uploading its contents" - cp -r "$WS_ARCHIVES_DIR" . - else - echo "No $WS_ARCHIVES_DIR found. Creating a dummy file." - echo "No archives found while doing backup upload" > "$ARCHIVES_DIR/no-archives-found.txt" - fi + echo "No $WS_ARCHIVES_DIR found. Creating a dummy file." + echo "No archives found while doing backup upload" > "$JENKINS_BUILD_ARCHIVE_DIR/no-archives-found.txt" fi echo "Contents of the archives dir:" |