From f5df25e0642c35968cbcbfaefc3bf2b37c38bf92 Mon Sep 17 00:00:00 2001 From: Olivier Bilodeau Date: Wed, 14 Aug 2019 14:55:36 -0400 Subject: [PATCH 1/3] CI: Install malboxes from local repository instead of upstream Will enable building branches and PRs in Jenkins for smoke testing --- tests/smoke/build-all-templates.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/smoke/build-all-templates.sh b/tests/smoke/build-all-templates.sh index fa55643..d6a25cb 100755 --- a/tests/smoke/build-all-templates.sh +++ b/tests/smoke/build-all-templates.sh @@ -16,7 +16,8 @@ # export PATH=$PATH:$HOME/.local/bin -pip3 install --upgrade git+https://github.com/GoSecure/malboxes.git@${GIT_BRANCH#*/}#egg=malboxes +#pip3 install --upgrade git+https://github.com/GoSecure/malboxes.git@${GIT_BRANCH#*/}#egg=malboxes +pip3 install -e . echo "Fetching all templates..." TEMPLATES=`malboxes list | head -n-1 | tail -n+3` From 3c2971dc8284065944c4bfc8a25e87549e89f9cd Mon Sep 17 00:00:00 2001 From: Olivier Bilodeau Date: Wed, 14 Aug 2019 15:03:14 -0400 Subject: [PATCH 2/3] better docs --- tests/smoke/build-all-templates.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/smoke/build-all-templates.sh b/tests/smoke/build-all-templates.sh index d6a25cb..1c1ab8d 100755 --- a/tests/smoke/build-all-templates.sh +++ b/tests/smoke/build-all-templates.sh @@ -16,7 +16,8 @@ # export PATH=$PATH:$HOME/.local/bin -#pip3 install --upgrade git+https://github.com/GoSecure/malboxes.git@${GIT_BRANCH#*/}#egg=malboxes + +echo "Performing a local install of malboxes in development mode" pip3 install -e . echo "Fetching all templates..." From fa43ec87336c0e6979a00d2093c46831bf16cb04 Mon Sep 17 00:00:00 2001 From: Olivier Bilodeau Date: Wed, 14 Aug 2019 15:04:51 -0400 Subject: [PATCH 3/3] Updated CHANGELOG --- CHANGELOG.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index b6ef48e..c185209 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -14,6 +14,7 @@ Bug fixes:: Infrastructure Improvements:: * Further improvements to Jenkins CI system fixed Windows 7 build issues ({uri-issue}108[#108], {uri-issue}110[#110]) +* Jenkins CI system can now perform smoke tests on external PRs ({uri-issue}123[#123]) == 0.4.0