From 5704ce13e474bf43557f6641e4322bf5913e8bae Mon Sep 17 00:00:00 2001 From: Scott Little Date: Thu, 24 Sep 2020 11:10:39 -0400 Subject: [PATCH] Remove references to cgcs-3rd-party-repo The concept of an independent 3rd party repo was dropped when StarlingX went open source. Delete this obsolete code. Story: 2006387 Task: 40970 Change-Id: I16df261eb4ad86d52ae8f65917ae9d27eaea608b Signed-off-by: Scott Little --- .gitignore | 1 - build-tools/build-pkgs-parallel | 1 - build-tools/build-pkgs-serial | 1 - build-tools/build-rpms-parallel | 3 --- build-tools/build-rpms-serial | 3 --- build-tools/build-srpms-parallel | 14 -------------- build-tools/build-srpms-serial | 14 -------------- build-tools/ip_report.py | 1 - build-tools/sync-jenkins | 2 -- build-tools/sync_jenkins.sh | 2 +- 10 files changed, 1 insertion(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 6f1f02bd..23f5a0d2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,5 @@ /centos-repo /cgcs-centos-repo /cgcs-tis-repo -/cgcs-3rd-party-repo /local-build-data /local-repo diff --git a/build-tools/build-pkgs-parallel b/build-tools/build-pkgs-parallel index 3156f1ac..bc65b3c8 100755 --- a/build-tools/build-pkgs-parallel +++ b/build-tools/build-pkgs-parallel @@ -206,7 +206,6 @@ find_targets () { sed -e "s#^mirror:CentOS/tis-r3-CentOS/mitaka#${CENTOS_REPO}#" \ -e "s#^mirror:#${CENTOS_REPO}/#" \ -e "s#^repo:#$MY_REPO/#" \ - -e "s#^3rd_party:#$MY_REPO/cgcs-3rd-party-repo/#" \ -e "s#^Source/#${CENTOS_REPO}/Source/#") name=$(rpm -q --qf='%{NAME}' --nosignature -p $path) else diff --git a/build-tools/build-pkgs-serial b/build-tools/build-pkgs-serial index 798f7881..f148ff28 100755 --- a/build-tools/build-pkgs-serial +++ b/build-tools/build-pkgs-serial @@ -207,7 +207,6 @@ find_targets () { sed -e "s#^mirror:CentOS/tis-r3-CentOS/mitaka#${CENTOS_REPO}#" \ -e "s#^mirror:#${CENTOS_REPO}/#" \ -e "s#^repo:#$MY_REPO/#" \ - -e "s#^3rd_party:#$MY_REPO/cgcs-3rd-party-repo/#" \ -e "s#^Source/#${CENTOS_REPO}/Source/#") name=$(rpm -q --qf='%{NAME}' --nosignature -p $path) else diff --git a/build-tools/build-rpms-parallel b/build-tools/build-rpms-parallel index f9728acc..4ca2202e 100755 --- a/build-tools/build-rpms-parallel +++ b/build-tools/build-rpms-parallel @@ -2183,9 +2183,6 @@ fi if [ $CLEAN_FLAG -eq 0 ]; then update_cgcs_repo ${CENTOS_REPO} - if [ -d $MY_REPO/cgcs-3rd-party-repo ]; then - update_cgcs_repo cgcs-3rd-party-repo - fi fi mock_clean_mounts diff --git a/build-tools/build-rpms-serial b/build-tools/build-rpms-serial index f2d1acc6..5bd7dbe7 100755 --- a/build-tools/build-rpms-serial +++ b/build-tools/build-rpms-serial @@ -1945,9 +1945,6 @@ fi if [ $CLEAN_FLAG -eq 0 ]; then update_cgcs_repo ${CENTOS_REPO} - if [ -d $MY_REPO/cgcs-3rd-party-repo ]; then - update_cgcs_repo cgcs-3rd-party-repo - fi fi mock_clean_mounts diff --git a/build-tools/build-srpms-parallel b/build-tools/build-srpms-parallel index 8baf2bfe..a4235080 100755 --- a/build-tools/build-srpms-parallel +++ b/build-tools/build-srpms-parallel @@ -56,7 +56,6 @@ if [ ! -d ${MIRROR_ROOT} ]; then fi fi -THIRD_PARTY_ROOT="$MY_REPO/cgcs-3rd-party-repo" REPO_DOWNLOADS_ROOT="$MY_REPO" SRPM_REBUILT_LIST="" SRPM_FAILED_REBUILD_LIST="" @@ -403,9 +402,6 @@ build_dir () { # If "mirror:" is specified, then we search for the file relateive to # $MIRROR_ROOT # - # If "3rd_party:" is specified, then we search for the file relateive to - # $THIRD_PARTY_ROOT - # # An absolute path is parsed as an absolute path (mainly intended for # developer/experimental use without checking in files or messing with # your git repos) @@ -424,11 +420,6 @@ build_dir () { echo "$p" | grep "^repo:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^repo:%$REPO_DOWNLOADS_ROOT/%") fi - if [ "${ORIG_SRPM_PATH}x" == "x" ]; then - # handle 3rd_party: definitions - echo "$p" | grep "^3rd_party:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^3rd_party:%$THIRD_PARTY_ROOT/%") - fi - if [ "${ORIG_SRPM_PATH}x" == "x" ]; then # handle mirror: definitions echo "$p" | grep "^mirror:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^mirror:%$MIRROR_ROOT/%" | sed "s#CentOS/tis-r3-CentOS/kilo/##" | sed "s#CentOS/tis-r3-CentOS/mitaka/##") @@ -1501,11 +1492,6 @@ if [ $ALL -eq 1 ]; then echo "$p" | grep "^repo:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^repo:%$REPO_DOWNLOADS_ROOT/%") fi - if [ "${ORIG_SRPM_PATH}x" == "x" ]; then - # handle repo: definitions - echo "$p" | grep "^3rd_party:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^3rd_party:%$THIRD_PARTY_ROOT/%") - fi - if [ "${ORIG_SRPM_PATH}x" == "x" ]; then # handle mirror: definitions echo "$p" | grep "^mirror:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^mirror:%$MIRROR_ROOT/%" | sed "s#CentOS/tis-r3-CentOS/kilo/##" | sed "s#CentOS/tis-r3-CentOS/mitaka/##") diff --git a/build-tools/build-srpms-serial b/build-tools/build-srpms-serial index dce460c6..7416900e 100755 --- a/build-tools/build-srpms-serial +++ b/build-tools/build-srpms-serial @@ -57,7 +57,6 @@ if [ ! -d ${MIRROR_ROOT} ]; then fi fi -THIRD_PARTY_ROOT="$MY_REPO/cgcs-3rd-party-repo" REPO_DOWNLOADS_ROOT="$MY_REPO" SRPM_REBUILT_LIST="" SRPM_FAILED_REBUILD_LIST="" @@ -389,9 +388,6 @@ build_dir () { # If "mirror:" is specified, then we search for the file relateive to # $MIRROR_ROOT # - # If "3rd_party:" is specified, then we search for the file relateive to - # $THIRD_PARTY_ROOT - # # An absolute path is parsed as an absolute path (mainly intended for # developer/experimental use without checking in files or messing with # your git repos) @@ -410,11 +406,6 @@ build_dir () { echo "$p" | grep "^repo:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^repo:%$REPO_DOWNLOADS_ROOT/%") fi - if [ "${ORIG_SRPM_PATH}x" == "x" ]; then - # handle 3rd_party: definitions - echo "$p" | grep "^3rd_party:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^3rd_party:%$THIRD_PARTY_ROOT/%") - fi - if [ "${ORIG_SRPM_PATH}x" == "x" ]; then # handle mirror: definitions echo "$p" | grep "^mirror:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^mirror:%$MIRROR_ROOT/%" | sed "s#CentOS/tis-r3-CentOS/kilo/##" | sed "s#CentOS/tis-r3-CentOS/mitaka/##") @@ -1327,11 +1318,6 @@ if [ $ALL -eq 1 ]; then echo "$p" | grep "^repo:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^repo:%$REPO_DOWNLOADS_ROOT/%") fi - if [ "${ORIG_SRPM_PATH}x" == "x" ]; then - # handle 3rd_party: definitions - echo "$p" | grep "^3rd_party:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^3rd_party:%$THIRD_PARTY_ROOT/%") - fi - if [ "${ORIG_SRPM_PATH}x" == "x" ]; then # handle mirror: definitions echo "$p" | grep "^mirror:" >/dev/null && ORIG_SRPM_PATH=$(echo $p | sed "s%^mirror:%$MIRROR_ROOT/%" | sed "s#CentOS/tis-r3-CentOS/kilo/##" | sed "s#CentOS/tis-r3-CentOS/mitaka/##") diff --git a/build-tools/ip_report.py b/build-tools/ip_report.py index 16359b36..ec5de2e0 100755 --- a/build-tools/ip_report.py +++ b/build-tools/ip_report.py @@ -360,7 +360,6 @@ class IPReport(object): filename = filename.replace('mirror:', self.repo + '/centos-repo/') filename = filename.replace('repo:', self.repo + '/') - filename = filename.replace('3rd_party:', self.repo + '/cgcs-3rd-party-repo/') # At this point, filename could be a complete path (incl symlink), or just a filename best_guess = filename diff --git a/build-tools/sync-jenkins b/build-tools/sync-jenkins index 3b8d3458..a5caa3ae 100755 --- a/build-tools/sync-jenkins +++ b/build-tools/sync-jenkins @@ -140,11 +140,9 @@ for build_type in std rt; do sleep 1 rsync ${JENKINSURL}/$build_type/centos-repo.last_head $MY_WORKSPACE/$build_type rsync ${JENKINSURL}/$build_type/cgcs-centos-repo.last_head $MY_WORKSPACE/$build_type - rsync ${JENKINSURL}/$build_type/cgcs-3rd-party-repo.last_head $MY_WORKSPACE/$build_type if [ "$build_type" == "std" ]; then cp $MY_WORKSPACE/$build_type/centos-repo.last_head $MY_REPO/centos-repo/.last_head cp $MY_WORKSPACE/$build_type/cgcs-centos-repo.last_head $MY_REPO/cgcs-centos-repo/.last_head - cp $MY_WORKSPACE/$build_type/cgcs-3rd-party-repo.last_head $MY_REPO/cgcs-3rd-party-repo/.last_head fi sleep 1 rsync -r ${JENKINSURL}/$build_type/results $build_type/ diff --git a/build-tools/sync_jenkins.sh b/build-tools/sync_jenkins.sh index 96e50ce2..b6666de3 100755 --- a/build-tools/sync_jenkins.sh +++ b/build-tools/sync_jenkins.sh @@ -130,7 +130,7 @@ for build_type in std rt; do rsync -r ${JENKINSURL}/$build_type/rpmbuild/SRPMS/* $MY_WORKSPACE/$build_type/rpmbuild/SRPMS sleep 1 # Some of there directories might not exist (obsolete). Just do our best and ignore errors - for sub_repo in centos-repo cgcs-centos-repo local-repo cgcs-tis-repo cgcs-3rd-party-repo; do + for sub_repo in centos-repo cgcs-centos-repo local-repo cgcs-tis-repo; do rsync ${JENKINSURL}/$build_type/$sub_repo.last_head $MY_WORKSPACE/$build_type if [ $? -eq 0 ] && [ "$build_type" == "std" ]; then cp $MY_WORKSPACE/$build_type/$sub_repo.last_head $MY_REPO/$sub_repo/.last_head