]>
git.apps.os.sepia.ceph.com Git - ceph-build.git/log
Dan Mick [Wed, 17 May 2017 18:54:39 +0000 (11:54 -0700)]
samba: remove inactive distros and erroneous variable definition
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Boris Ranto [Thu, 18 May 2017 18:57:28 +0000 (20:57 +0200)]
samba: Strip out origin/ for CEPH_BRANCH
When we pass the CEPH_BRANCH from ceph-dev-build, it contains
origin/<branch>, we need to strip out the remote from the CEPH_BRANCH
before we can use it.
Also set BRANCH to SAMBA_BRANCH since we use BRANCH to post to chacra.
Signed-off-by: Boris Ranto <branto@redhat.com>
Boris Ranto [Thu, 18 May 2017 16:41:06 +0000 (18:41 +0200)]
Merge pull request #728 from ceph/wip-samba-trigger
A couple more samba fixes
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Boris Ranto [Thu, 18 May 2017 15:46:59 +0000 (17:46 +0200)]
samba: Rename BRANCH to SAMBA_BRANCH
This fixes the builds triggered by ceph. Otherwise we will try to fetch
the same branch as ceph and that one will likely not exist.
Signed-off-by: Boris Ranto <branto@redhat.com>
Boris Ranto [Thu, 18 May 2017 15:19:26 +0000 (17:19 +0200)]
samba: Drop default trusty build
We no longer need to build for trusty by default.
Signed-off-by: Boris Ranto <branto@redhat.com>
Boris Ranto [Thu, 18 May 2017 15:17:12 +0000 (17:17 +0200)]
samba: Add pam dependency
Signed-off-by: Boris Ranto <branto@redhat.com>
Boris Ranto [Thu, 18 May 2017 14:58:26 +0000 (16:58 +0200)]
samba: Fix the xargs command
The xargs command only serialized the input. Using the plain on lines to
be sure this time.
Signed-off-by: Boris Ranto <branto@redhat.com>
Alfredo Deza [Thu, 18 May 2017 14:22:22 +0000 (10:22 -0400)]
Merge pull request #727 from ceph/wip-samba-trigger
samba: Clean old ceph bits before getting new
Boris Ranto [Thu, 18 May 2017 13:56:20 +0000 (15:56 +0200)]
samba: Clean old ceph bits before getting new
Debian/Ubuntu does not tie the package versions the same way the rpm
packagin does so upgrading a single package won't remove any old
packages. Remove the old bits before installing any new.
This should fix a build failure on xenial where there were two libcephfs
libraries present on the system at the time of build which broke the
build.
Signed-off-by: Boris Ranto <branto@redhat.com>
Alfredo Deza [Thu, 18 May 2017 13:04:27 +0000 (09:04 -0400)]
Merge pull request #725 from ceph/wip-samba-trigger
samba-trigger: Trigger build on commits
Boris Ranto [Thu, 18 May 2017 10:40:23 +0000 (12:40 +0200)]
samba: Trigger builds on push to ceph repo
Signed-off-by: Boris Ranto <branto@redhat.com>
Boris Ranto [Thu, 18 May 2017 10:35:41 +0000 (12:35 +0200)]
samba: Build against desired ceph branch/commit
Signed-off-by: Boris Ranto <branto@redhat.com>
Boris Ranto [Thu, 18 May 2017 08:54:51 +0000 (10:54 +0200)]
samba-trigger: Trigger build on commits
This will trigger a samba build on push to any of master* ceph* or wip-*
branches.
Signed-off-by: Boris Ranto <branto@redhat.com>
Sébastien Han [Thu, 18 May 2017 09:53:57 +0000 (11:53 +0200)]
Merge pull request #726 from ceph/fix_poolrefresh
scripts: fix virsh pool-refresh issue
Guillaume Abrioux [Thu, 18 May 2017 09:35:43 +0000 (11:35 +0200)]
scripts: fix virsh pool-refresh issue
`
c7edf24 ` introduced a new behavior regarding teardown.
`virsh pool-refresh default` might fail if the pool doesn't exist yet.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Andrew Schoen [Wed, 17 May 2017 21:57:51 +0000 (16:57 -0500)]
Merge pull request #723 from ceph/wip-libvirt-destruction
scripts: Be more aggressive with deleting libvirt VMs
David Galloway [Wed, 17 May 2017 21:49:55 +0000 (17:49 -0400)]
scripts: Be more aggressive with deleting libvirt VMs
This PR ensures all slaves that use tox & Vagrant don't have any running libvirt VMs that could cause IP collisions
Signed-off-by: David Galloway <dgallowa@redhat.com>
Alfredo Deza [Wed, 17 May 2017 21:33:57 +0000 (17:33 -0400)]
Merge pull request #720 from ceph/wip-cleanup-libvirt
scripts: Add function to delete leftover vagrant VMs
David Galloway [Wed, 17 May 2017 15:51:37 +0000 (11:51 -0400)]
scripts: Add function to delete leftover vagrant VMs
Some of the network errors thrown by libvirt when running
Docker builds were because the slave had leftover Vagrant VMs that didn't
get destroyed.
This PR ensures all slaves being used for Docker tests will have VMs and disk images cleaned up if the build fails.
Signed-off-by: David Galloway <dgallowa@redhat.com>
Sébastien Han [Wed, 17 May 2017 16:37:02 +0000 (18:37 +0200)]
Merge pull request #719 from ceph/link-docker
ceph-docker-lint: start docker and use sudo
Sébastien Han [Wed, 17 May 2017 16:32:46 +0000 (18:32 +0200)]
ceph-docker-lint: start docker and use sudo
yum does not start services after installation, so starting it and using
sudo to call docker command.
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Wed, 17 May 2017 16:27:22 +0000 (18:27 +0200)]
Merge pull request #718 from ceph/docker-lint-selinux
ceph-docker-lint: remove chcon command
Sébastien Han [Wed, 17 May 2017 16:20:02 +0000 (18:20 +0200)]
ceph-docker-lint: remove chcon command
selinux is disabled so this command is useless.
Signed-off-by: Sébastien Han <seb@redhat.com>
Alfredo Deza [Wed, 17 May 2017 16:03:06 +0000 (12:03 -0400)]
Merge pull request #714 from ceph/shellcheck-version
Shellcheck version
Sébastien Han [Tue, 16 May 2017 14:22:21 +0000 (16:22 +0200)]
ceph-docker-lint: add docker shellcheck
To run shellcheck with the -x option (Follow 'source' statements even
when the file is not specified as input. By default, shellcheck will
only follow files specified on the command line (plus /dev/null). This
option allows following any file the script may source.) we need at
least version 0.4.0.
Unfortunately epel only provides a 0.3.X version.
Fortunately, the container image provides the latest version which helps
us running the tests.
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Mon, 15 May 2017 15:08:43 +0000 (17:08 +0200)]
ceph-docker-lint: test code SC2015
Work around in https://github.com/ceph/ceph-docker/pull/622
Using if and unset -e and reset it.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1450480
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Mon, 15 May 2017 13:15:20 +0000 (15:15 +0200)]
ceph-docker-lint: remove -x arg
The current version from EPEL does not have the -x argument.
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Mon, 15 May 2017 12:53:17 +0000 (14:53 +0200)]
ceph-docker-lint: remove .build.swp file
Signed-off-by: Sébastien Han <seb@redhat.com>
Alfredo Deza [Wed, 17 May 2017 14:26:08 +0000 (10:26 -0400)]
Merge pull request #716 from ceph/wip-cannon-url
really fix the expected url to be canonicalized
Gregory Meno [Mon, 15 May 2017 18:14:34 +0000 (11:14 -0700)]
really fix the expected url to be canonicalized
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Alfredo Deza [Mon, 15 May 2017 23:00:27 +0000 (19:00 -0400)]
Merge pull request #717 from ceph/docker-scenarios
ceph-docker: update scenario names
Andrew Schoen [Mon, 15 May 2017 20:36:07 +0000 (15:36 -0500)]
ceph-docker: update scenario names
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Mon, 15 May 2017 17:58:14 +0000 (13:58 -0400)]
Merge pull request #715 from ceph/wip-fix-jenkins-invocation
fix the expected value of HUDSON_URL
Gregory Meno [Mon, 15 May 2017 17:28:39 +0000 (10:28 -0700)]
fix the expected value of HUDSON_URL
and exit when deps aren't installed when running locally
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Alfredo Deza [Fri, 12 May 2017 17:38:27 +0000 (13:38 -0400)]
Merge pull request #713 from ceph/shellcheck-exclude
ceph-docker-lint: exclude codes
Sébastien Han [Fri, 12 May 2017 08:54:17 +0000 (10:54 +0200)]
ceph-docker-lint: do not check variables_entrypoint.sh
Shellcheck will complain with SC2034: foo appears unused. Verify it or
export it.
The problem here is that this file contains a reference of all the
variables so indeed they appear unused.
We could potentially source some portion of the code from that file,
however I don't want to change the structure of the code because of
shellchecker. Also sourcing all the variables might results in expected
scenario if these variables are not expected to be declared.
There is no way to tell shellcheck to ignore this file so we should not
test it.
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Fri, 12 May 2017 08:08:42 +0000 (10:08 +0200)]
ceph-docker-lint: exclude codes
Excluding the following code:
* SC1091: since our entrypoint copies files in / during this shellcheck
the files can not be found. Basically we source ./file but presently the
file is under osd_directory/file so can not be found.
* SC2015: because we use 'set -e' we don't have other choice to use '||
true' here.
* SC2009: pgrep returns processes ID where we are looking for a specific
string in the process line.
* SC2001: our sed expressions are too complex we can not substitute them
with bash ${variable//search/replace}.
Signed-off-by: Sébastien Han <seb@redhat.com>
Alfredo Deza [Thu, 11 May 2017 16:34:41 +0000 (12:34 -0400)]
Merge pull request #712 from ceph/docker-ceph-ansible-version
ceph-docker-nightly: test on stable-2.2 of ceph-ansible
Andrew Schoen [Thu, 11 May 2017 16:30:54 +0000 (11:30 -0500)]
ceph-docker-nightly: test on stable-2.2 of ceph-ansible
We don't need to test on stable-2.1 of ceph-ansible anymore
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Thu, 11 May 2017 11:49:16 +0000 (07:49 -0400)]
Merge pull request #711 from ceph/shellchecker-source
ceph-docker-lint: Shellchecker source
Sébastien Han [Thu, 11 May 2017 05:21:12 +0000 (07:21 +0200)]
ceph-docker-lint: remove reverse grep for NOT_MAINTAINED_ANYMORE
As per PR: https://github.com/ceph/ceph-docker/pull/632 the directory
NOT_MAINTAINED_ANYMORE does not exist anymore.
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Thu, 11 May 2017 05:17:25 +0000 (07:17 +0200)]
ceph-docker-lint: shellcheck: allow 'source' outside of FILES.
ceph-docker sources a lot of files so to prevent warning from shellcheck
we add the option '-x' to source.
Follow 'source' statements even when the file is not specified as input.
By default, shellcheck will only follow files specified on the command
line (plus /dev/null). This option allows following any file the
script may source.
Signed-off-by: Sébastien Han <seb@redhat.com>
Gregory Meno [Wed, 10 May 2017 21:10:17 +0000 (14:10 -0700)]
Merge pull request #710 from ceph/wip-filter
filter files in PR to be only files ending in .sh$
Gregory Meno [Wed, 10 May 2017 21:03:53 +0000 (14:03 -0700)]
filter files in PR to be only files ending in .sh$
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Gregory Meno [Tue, 9 May 2017 22:39:58 +0000 (15:39 -0700)]
Merge pull request #709 from ceph/wip-docker-lint-config
check lint on all PRs automatically
Gregory Meno [Tue, 9 May 2017 22:37:41 +0000 (15:37 -0700)]
Merge branch 'master' into wip-docker-lint-config
Gregory Meno [Tue, 9 May 2017 22:37:03 +0000 (15:37 -0700)]
check lint on all PRs automatically
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Gregory Meno [Tue, 9 May 2017 22:35:00 +0000 (15:35 -0700)]
Merge pull request #708 from ceph/wip-docker-lint-config
remove trigger whitelist
Gregory Meno [Tue, 9 May 2017 22:33:10 +0000 (15:33 -0700)]
remove trigger whitelist
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Gregory Meno [Tue, 9 May 2017 22:24:58 +0000 (15:24 -0700)]
Merge pull request #707 from ceph/wip-docker-lint
fix exit of build script
Gregory Meno [Tue, 9 May 2017 22:22:31 +0000 (15:22 -0700)]
Merge branch 'master' into wip-docker-lint
Gregory Meno [Tue, 9 May 2017 22:21:30 +0000 (15:21 -0700)]
fix exit of build script
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Gregory Meno [Sat, 6 May 2017 02:00:03 +0000 (19:00 -0700)]
Merge pull request #706 from ceph/wip-docker-lint
limit shellcheck to files changed by the PR
Gregory Meno [Sat, 6 May 2017 01:56:20 +0000 (18:56 -0700)]
limit shellcheck to files changed by the PR
also add some provisions for running locally
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Gregory Meno [Thu, 4 May 2017 22:53:56 +0000 (15:53 -0700)]
Merge pull request #704 from ceph/wip-docker-lint2
correct lint executable; filter paths; set +e so we can lint all files
Gregory Meno [Thu, 4 May 2017 22:43:24 +0000 (22:43 +0000)]
correct lint executable; filter paths; set +e so we can lint all files
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Gregory Meno [Thu, 4 May 2017 22:13:46 +0000 (15:13 -0700)]
Merge pull request #703 from ceph/wip-docker-lint
install EPEL and correct package name
Gregory Meno [Thu, 4 May 2017 22:08:32 +0000 (15:08 -0700)]
Merge branch 'master' into wip-docker-lint
Gregory Meno [Thu, 4 May 2017 22:06:38 +0000 (15:06 -0700)]
install EPEL and correct package name
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Andrew Schoen [Thu, 4 May 2017 21:47:49 +0000 (16:47 -0500)]
Merge pull request #702 from ceph/wip-docker-lint
adds a linting of all shell files the project
Gregory Meno [Thu, 4 May 2017 21:24:54 +0000 (14:24 -0700)]
adds a linting of all shell files in the project
Signed-off-by: Gregory Meno <gmeno@redhat.com>
Alfredo Deza [Thu, 4 May 2017 20:21:20 +0000 (16:21 -0400)]
Merge pull request #701 from ceph/log-retention
Keep logs around longer for ceph-ansible/docker jobs
Andrew Schoen [Thu, 4 May 2017 19:54:56 +0000 (14:54 -0500)]
ceph-docker-prs: keep all logs in a 15 day period
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Thu, 4 May 2017 19:54:23 +0000 (14:54 -0500)]
ceph-ansible-prs: keep all logs in a 15 day period
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Thu, 4 May 2017 19:53:53 +0000 (14:53 -0500)]
ceph-docker-nightly: keep all logs forever
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Tue, 2 May 2017 19:00:07 +0000 (15:00 -0400)]
Merge pull request #695 from ceph/libvirt-fixes
attempt to make libvirt slaves more stable
Andrew Schoen [Tue, 2 May 2017 12:49:23 +0000 (07:49 -0500)]
use libvirt util methods in all jobs that use libvirt
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 2 May 2017 12:45:28 +0000 (07:45 -0500)]
scripts: add libvirt util functions to build_utils.sh
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 18:09:21 +0000 (13:09 -0500)]
ceph-installer-tests: restart libvirt services before running tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 18:08:47 +0000 (13:08 -0500)]
ceph-docker-prs: restart libvirt services before running tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 18:08:28 +0000 (13:08 -0500)]
ceph-docker-nightly: restart libvirt services before running tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 18:08:07 +0000 (13:08 -0500)]
ceph-ansible-prs: restart libvirt services before running tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 18:04:35 +0000 (13:04 -0500)]
ceph-installer-tests: remove old libvirt networks before running tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 18:04:00 +0000 (13:04 -0500)]
ceph-docker-prs: remove old libvirt networks before running tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 18:03:27 +0000 (13:03 -0500)]
ceph-docker-nightly: remove old libvirt networks before running tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Tue, 2 May 2017 18:56:11 +0000 (14:56 -0400)]
Merge pull request #700 from ceph/wip-nfs-ganesha-version
nfs-ganesha: fix rpm version finder to work on dev and release candid…
Ali Maredia [Tue, 2 May 2017 15:53:14 +0000 (11:53 -0400)]
nfs-ganesha: set VERSION correctly in rpm builds
$VERSION now set properly for "dev-X" & "rcX"
versions in rpm builds of nfs-ganesha.
Signed-off-by: Ali Maredia <amaredia@redhat.com>
Alfredo Deza [Mon, 1 May 2017 20:49:02 +0000 (16:49 -0400)]
Merge pull request #699 from ceph/ceph-ansible-scenario-fix
ceph-ansible-scenario: enable concurrent builds
Andrew Schoen [Mon, 1 May 2017 20:40:53 +0000 (15:40 -0500)]
ceph-ansible-scenario: enable concurrent builds
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Mon, 1 May 2017 14:39:40 +0000 (10:39 -0400)]
Merge pull request #698 from ceph/ceph-ansible-scenario-fix
ceph-ansible-scenario: use include-raw instead of include-raw-escape
Andrew Schoen [Mon, 1 May 2017 14:27:07 +0000 (09:27 -0500)]
ceph-ansible-scenario: use include-raw instead of include-raw-escape
This job is not using a job-template and fails with the following error
when using include-raw-escape:
syntax error near unexpected token `{{'
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 20:14:48 +0000 (15:14 -0500)]
Merge pull request #697 from ceph/ceph-ansible-scenario
ceph-ansible-scenario: create an individual scenario job
Alfredo Deza [Fri, 28 Apr 2017 20:02:23 +0000 (16:02 -0400)]
ceph-ansible-scenario: create an individual scenario job
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 19:54:46 +0000 (14:54 -0500)]
Merge pull request #696 from ceph/disable-ceph-prs-arm
ceph-prs-arm: disable for now, needs to get worked on
Alfredo Deza [Fri, 28 Apr 2017 18:40:20 +0000 (14:40 -0400)]
ceph-prs-arm: disable for now, needs to get worked on
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Andrew Schoen [Fri, 28 Apr 2017 14:44:15 +0000 (09:44 -0500)]
Merge pull request #693 from ceph/patched-jenkins
ansible: using forked version of python-jenkins until we can fix upstream
Alfredo Deza [Fri, 28 Apr 2017 14:37:25 +0000 (10:37 -0400)]
ansible: update examples with patched python-jenkins
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 27 Apr 2017 01:17:26 +0000 (21:17 -0400)]
ansible: using forked version of python-jenkins until we can fix upstream
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 27 Apr 2017 15:08:00 +0000 (11:08 -0400)]
Merge pull request #694 from ceph/rpm-install-mock
ceph-ansible/-installer: explicitly install mock
Ken Dreyer [Thu, 27 Apr 2017 15:02:51 +0000 (09:02 -0600)]
ceph-ansible/-installer: explicitly install mock
It appears that Yum is not installing "mock" when installing fedpkg
(with fedpkg-1.28-1.el7). Explicitly install it in our build steps.
Alfredo Deza [Thu, 27 Apr 2017 01:20:51 +0000 (21:20 -0400)]
Merge pull request #692 from ceph/slave-java-version
ansible: we now need java-1.8.0-openjdk on rpm nodes
Andrew Schoen [Thu, 27 Apr 2017 01:06:37 +0000 (20:06 -0500)]
ansible: we now need java-1.8.0-openjdk on rpm nodes
After the latest jenkins upgrade to 2.57 our centos slaves failed to
connect to jenkins, upgrading to a 1.8.0 version of java fixed the
issue.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 25 Apr 2017 19:21:21 +0000 (14:21 -0500)]
Merge pull request #691 from ceph/ganesha-json-fix
nfs-ganesha: add missing comma in JSON blob
Alfredo Deza [Tue, 25 Apr 2017 19:02:16 +0000 (15:02 -0400)]
nfs-ganesha: add missing comma in JSON blob
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Andrew Schoen [Tue, 25 Apr 2017 18:26:39 +0000 (13:26 -0500)]
Merge pull request #689 from ceph/ceph-prs-arm
ceph-prs-arm: create a job to build arm on PRs
Alfredo Deza [Mon, 24 Apr 2017 18:04:46 +0000 (14:04 -0400)]
ceph-prs-arm: create a job to build arm on PRs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Tue, 25 Apr 2017 18:19:23 +0000 (14:19 -0400)]
Merge pull request #690 from ceph/libvirt-hammer
ceph-ansible-prs: remove old libvirt networks before running tests
Andrew Schoen [Tue, 25 Apr 2017 18:04:24 +0000 (13:04 -0500)]
ceph-ansible-prs: remove old libvirt networks before running tests
Occasionally we deal with libvirt network issues on jenkins slaves that
have been used for a couple test runs, this attempts to avoid those.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Gregory Meno [Sat, 22 Apr 2017 05:40:01 +0000 (22:40 -0700)]
Merge pull request #688 from ceph/wip-bz-mill
re-organize the script
Gregory Meno [Sat, 22 Apr 2017 05:38:03 +0000 (22:38 -0700)]
re-organize the script
Signed-off-by: Gregory Meno <gmeno@redhat.com>