diff options
| author | Abhishek Koneru <akoneru@redhat.com> | 2013-11-09 03:13:23 -0500 |
|---|---|---|
| committer | Abhishek Koneru <akoneru@redhat.com> | 2013-11-10 15:16:02 -0500 |
| commit | c75ce3cf5e20be3f9a4b12f8e2b982a41ca9b4ca (patch) | |
| tree | 06a92cbce32b75716027fe77260164aae4660da2 /scripts | |
| parent | abd6142c740225d0e7632111fdc19317710a5701 (diff) | |
| download | pki-c75ce3cf5e20be3f9a4b12f8e2b982a41ca9b4ca.tar.gz pki-c75ce3cf5e20be3f9a4b12f8e2b982a41ca9b4ca.tar.xz pki-c75ce3cf5e20be3f9a4b12f8e2b982a41ca9b4ca.zip | |
Fixes for review comments
Fixed the basic review comments for patches 74,75,76,77,78.
Tickets #657,722,723,724,725,785
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/compose_functions | 19 | ||||
| -rwxr-xr-x | scripts/compose_pki_test_package | 2 | ||||
| -rw-r--r-- | scripts/conf/repository.cfg | 8 |
3 files changed, 11 insertions, 18 deletions
diff --git a/scripts/compose_functions b/scripts/compose_functions index 49ca67f48..9271a0bc0 100644 --- a/scripts/compose_functions +++ b/scripts/compose_functions @@ -242,17 +242,8 @@ Fetch_Source_Tarball() ### # Create repository using the details in the config file ### # Function parameters - $1 - repository file path. -# Sample repository file : -# ### Location where the files have to be copied ### -# ### Same parameter for both local and remote ### -# REPOSITORY_LOCATION=/var/www/html/pki/ -# -# ### Remote host details### -# REMOTE_HOSTNAME_OR_IP=vm-051.idm.lab.bos.redhat.com -# USERNAME=root -# PASSWORD=******** ### -# + Create_repo_after_build() { if [ $# -eq 0 ]; then @@ -269,7 +260,7 @@ Create_repo_after_build() ### Remove leading and trailing whitespaces ### repo_location=`echo $REPOSITORY_LOCATION |sed -e 's/^ *//g' -e 's/ *$//g'` - destination=`echo $REMOTE_HOSTNAME_OR_IP|sed -e 's/^ *//g' -e 's/ *$//g'` + destination=`echo $REPOSITORY_HOST|sed -e 's/^ *//g' -e 's/ *$//g'` uname=`echo $USERNAME |sed -e 's/^ *//g' -e 's/ *$//g'` pwd=`echo $PASSWORD |sed -e 's/^ *//g' -e 's/ *$//g'` @@ -277,9 +268,7 @@ Create_repo_after_build() if [ "$destination" != "" ] ; then createrepo ./RPMS/noarch/ createrepo ./RPMS/x86_64/ - createrepo ./SOURCES/ createrepo ./SRPMS/ - createrepo ./SPECS/ if [ $uname == "" ] ; then echo "No username provided in the configuration file." echo "Enter the username:" @@ -294,8 +283,6 @@ Create_repo_after_build() echo $url ./scp_the_repo.exp "RPMS/" $url $PASSWORD ./scp_the_repo.exp "SRPMS/" $url $PASSWORD - ./scp_the_repo.exp "SOURCES/" $url $PASSWORD - ./scp_the_repo.exp "SPECS/" $url $PASSWORD if [ $? -ne 0 ]; then echo "Cannot copy the repositories to $destination\n" exit -1 @@ -309,9 +296,7 @@ Create_repo_after_build() cp -r RPMS SOURCES SRPMS SPECS $repo_location createrepo $REPOSITORY_LOCATION/RPMS/noarch/ createrepo $REPOSITORY_LOCATION/RPMS/x86_64/ - createrepo $REPOSITORY_LOCATION/SOURCES/ createrepo $REPOSITORY_LOCATION/SRPMS/ - createrepo $REPOSITORY_LOCATION/SPECS/ echo "Build repository created at $repo_location." exit 0 fi diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package index eca169f6b..705cd9859 100755 --- a/scripts/compose_pki_test_package +++ b/scripts/compose_pki_test_package @@ -45,7 +45,7 @@ COMPOSE_DIR=`dirname $0 | cd ; pwd` PKI_SOURCE_DIR=`cd $COMPOSE_DIR/..; pwd` ### Build the task rpm outside the PKI git source tree. -### The rhts-build-package command checks if the code is is a git repository, +### The rhts-mk-build-package command checks if the code is is a git repository, ### if yes, it will compare tags of the current branch and the master branch. ### If they do not match then the rpm is not built. diff --git a/scripts/conf/repository.cfg b/scripts/conf/repository.cfg new file mode 100644 index 000000000..fba586c69 --- /dev/null +++ b/scripts/conf/repository.cfg @@ -0,0 +1,8 @@ +### Location where the files have to be copied ### +### Same parameter for both local and remote ### +REPOSITORY_LOCATION=/var/www/html/pki + +### Remote host details### +REPOSITORY_HOST= +USERNAME= +PASSWORD= |