Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix default target GitHub account/organisation for --new-pr & co + fix tests that got broken by migration to github.com/easybuilders #2258

Merged
merged 4 commits into from
Jul 5, 2017
Merged

fix default target GitHub account/organisation for --new-pr & co + fix tests that got broken by migration to github.com/easybuilders #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fce006b
fix target GitHub account/organisation for --new-pr & co
boegel Jul 5, 2017
59f594c
fix tests that got broken by migration to github.com/easybuilders
boegel Jul 5, 2017
edb74d8
fix URLS in install_eb_dep.sh script used by Travis
boegel Jul 5, 2017
a31f5a1
fix typo in URL for EasyBuild website in install_eb_dep.sh script
boegel Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions easybuild/scripts/install_eb_dep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ PRECONFIG_CMD=

if [ x$PKG_NAME == 'xmodules' ]; then
PKG_URL="http://prdownloads.sourceforge.net/modules/${PKG}.tar.gz"
BACKUP_PKG_URL="http://hpcugent.github.io/easybuild/files/${PKG}.tar.gz"
BACKUP_PKG_URL="http://easybuilders.github.io/easybuild/files/${PKG}.tar.gz"
export PATH=$PREFIX/Modules/$PKG_VERSION/bin:$PATH
export MOD_INIT=$HOME/Modules/$PKG_VERSION/init/bash

elif [ x$PKG_NAME == 'xlua' ]; then
PKG_URL="http://downloads.sourceforge.net/project/lmod/${PKG}.tar.gz"
BACKUP_PKG_URL="http://hpcugent.github.io/easybuild/files/${PKG}.tar.gz"
BACKUP_PKG_URL="http://easybuilders.github.io/easybuild/files/${PKG}.tar.gz"
PRECONFIG_CMD="make clean"
CONFIG_OPTIONS='--with-static=yes'
export PATH=$PWD/$PKG:$PREFIX/bin:$PATH
Expand All @@ -35,7 +35,7 @@ elif [ x$PKG_NAME == 'xLmod' ]; then

elif [ x$PKG_NAME == 'xmodules-tcl' ]; then
# obtain tarball from upstream via http://modules.cvs.sourceforge.net/viewvc/modules/modules/?view=tar&revision=1.147
PKG_URL="http://hpcugent.github.io/easybuild/files/modules-tcl-${PKG_VERSION}.tar.gz"
PKG_URL="http://easybuilders.github.io/easybuild/files/modules-tcl-${PKG_VERSION}.tar.gz"
export MODULESHOME=$PREFIX/$PKG/tcl # required by init/bash source script
export PATH=$MODULESHOME:$PATH
export MOD_INIT=$MODULESHOME/init/bash.in
Expand All @@ -56,7 +56,7 @@ set -e

# environment-modules needs a patch to work with Tcl8.6
if [ x$PKG_NAME == 'xmodules' ]; then
wget -O 'modules-tcl8.6.patch' 'https://hpcugent.github.io/easybuild/files/modules-3.2.10-tcl8.6.patch'
wget -O 'modules-tcl8.6.patch' 'https://easybuilders.github.io/easybuild/files/modules-3.2.10-tcl8.6.patch'
patch ${PKG}/cmdModule.c modules-tcl8.6.patch
fi

Expand Down
2 changes: 1 addition & 1 deletion easybuild/tools/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
GITHUB_URL = 'https://github.com'
GITHUB_API_URL = 'https://api.github.com'
GITHUB_DIR_TYPE = u'dir'
GITHUB_EB_MAIN = 'hpcugent'
GITHUB_EB_MAIN = 'easybuilders'
GITHUB_EASYCONFIGS_REPO = 'easybuild-easyconfigs'
GITHUB_FILE_TYPE = u'file'
GITHUB_MAX_PER_PAGE = 100
Expand Down
7 changes: 5 additions & 2 deletions test/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,10 @@ def test_obtain_file(self):

# file specifications via URL also work, are downloaded to (first) sourcepath
init_config(args=["--sourcepath=%s:/no/such/dir:%s" % (tmpdir, sandbox_sources)])
urls = ["http://hpcugent.github.io/easybuild/index.html", "https://hpcugent.github.io/easybuild/index.html"]
urls = [
"http://easybuilders.github.io/easybuild/index.html",
"https://easybuilders.github.io/easybuild/index.html",
]
for file_url in urls:
fn = os.path.basename(file_url)
res = None
Expand All @@ -912,7 +915,7 @@ def test_obtain_file(self):
self.assertTrue(os.path.exists(loc), "%s file is found at %s" % (fn, loc))
txt = open(loc, 'r').read()
eb_regex = re.compile("EasyBuild: building software with ease")
self.assertTrue(eb_regex.search(txt))
self.assertTrue(eb_regex.search(txt), "Pattern '%s' found in: %s" % (eb_regex.pattern, txt))
else:
print "ignoring failure to download %s in test_obtain_file, testing offline?" % file_url

Expand Down
20 changes: 10 additions & 10 deletions test/framework/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ def test_from_pr(self):

tmpdir = tempfile.mkdtemp()
args = [
# PR for foss/2015a, see https://github.com/hpcugent/easybuild-easyconfigs/pull/1239/files
# PR for foss/2015a, see https://github.com/easybuilders/easybuild-easyconfigs/pull/1239/files
'--from-pr=1239',
'--dry-run',
# an argument must be specified to --robot, since easybuild-easyconfigs may not be installed
Expand Down Expand Up @@ -978,7 +978,7 @@ def test_from_pr_listed_ecs(self):
'toy-0.0.eb',
'gompi-2015a.eb', # also pulls in GCC, OpenMPI (which pulls in hwloc and numactl)
'GCC-4.6.3.eb',
# PR for foss/2015a, see https://github.com/hpcugent/easybuild-easyconfigs/pull/1239/files
# PR for foss/2015a, see https://github.com/easybuilders/easybuild-easyconfigs/pull/1239/files
'--from-pr=1239',
'--dry-run',
# an argument must be specified to --robot, since easybuild-easyconfigs may not be installed
Expand Down Expand Up @@ -1021,7 +1021,7 @@ def test_from_pr_x(self):
os.close(fd)

args = [
# PR for foss/2015a, see https://github.com/hpcugent/easybuild-easyconfigs/pull/1239/files
# PR for foss/2015a, see https://github.com/easybuilders/easybuild-easyconfigs/pull/1239/files
'--from-pr=1239',
'FFTW-3.3.4-gompi-2015a.eb', # required ConfigureMake easyblock, which is available in test easyblocks
# an argument must be specified to --robot, since easybuild-easyconfigs may not be installed
Expand Down Expand Up @@ -2191,7 +2191,7 @@ def test_review_pr(self):
return

self.mock_stdout(True)
# PR for zlib 1.2.8 easyconfig, see https://github.com/hpcugent/easybuild-easyconfigs/pull/1484
# PR for zlib 1.2.8 easyconfig, see https://github.com/easybuilders/easybuild-easyconfigs/pull/1484
args = [
'--color=never',
'--github-user=%s' % GITHUB_TEST_ACCOUNT,
Expand Down Expand Up @@ -2437,9 +2437,9 @@ def test_new_update_pr(self):
self.assertTrue(False, "Failed to find temporary git working dir: %s" % dirs)

regexs = [
r"^== fetching branch 'develop' from https://github.com/hpcugent/easybuild-easyconfigs.git...",
r"^== fetching branch 'develop' from https://github.com/easybuilders/easybuild-easyconfigs.git...",
r"^Opening pull request \[DRY RUN\]",
r"^\* target: hpcugent/easybuild-easyconfigs:develop",
r"^\* target: easybuilders/easybuild-easyconfigs:develop",
r"^\* from: %s/easybuild-easyconfigs:.*_new_pr_toy00" % GITHUB_TEST_ACCOUNT,
r"^\* title: \"\{tools\}\[gompi/1.3.12\] toy v0.0\"",
r"\(created using `eb --new-pr`\)", # description
Expand Down Expand Up @@ -2531,11 +2531,11 @@ def test_new_update_pr(self):
self.mock_stdout(False)

regexs = [
r"^== Determined branch name corresponding to hpcugent/easybuild-easyconfigs PR #2237: develop",
r"^== fetching branch 'develop' from https://github.com/hpcugent/easybuild-easyconfigs.git...",
r"^== Determined branch name corresponding to easybuilders/easybuild-easyconfigs PR #2237: develop",
r"^== fetching branch 'develop' from https://github.com/easybuilders/easybuild-easyconfigs.git...",
r".*/toy-0.0-gompi-1.3.12-test.eb\s*\|",
r"^\s*1 file changed",
r"^Updated hpcugent/easybuild-easyconfigs PR #2237 by pushing to branch hpcugent/develop \[DRY RUN\]",
r"^Updated easybuilders/easybuild-easyconfigs PR #2237 by pushing to branch easybuilders/develop \[DRY RUN\]",
]
for regex in regexs:
regex = re.compile(regex, re.M)
Expand Down Expand Up @@ -2592,7 +2592,7 @@ def test_new_pr_delete(self):


regexs = [
r"^== fetching branch 'develop' from https://github.com/hpcugent/easybuild-easyconfigs.git...",
r"^== fetching branch 'develop' from https://github.com/easybuilders/easybuild-easyconfigs.git...",
r'title: "delete bzip2-1.6.0"',
r"1 file changed, [0-9]+ deletions\(-\)",
]
Expand Down