1
diff --git a/jobs/generic-build-snap-worker b/jobs/generic-build-snap-worker
2
index d0008df..074318d 100755
3
--- a/jobs/generic-build-snap-worker
4
+++ b/jobs/generic-build-snap-worker
5
@@ -33,17 +33,27 @@ if [ -n "$SOURCE_GIT_REPO" ]; then
6
33
		$REVISION
33
		$REVISION
7
34
fi
34
fi
8
35
35
9
36
# Always build against master so all tests are performed
10
37
CI_BRANCH=master
11
38
12
39
git checkout $CI_BRANCH
13
36
if [ ! -e snapcraft.yaml ] ; then
40
if [ ! -e snapcraft.yaml ] ; then
14
37
	echo "WARNING: Can't build snap as no snapcraft.yaml exists!"
41
	echo "WARNING: Can't build snap as no snapcraft.yaml exists!"
15
38
	exit 0
42
	exit 0
16
39
fi
43
fi
17
40
44
18
45
REPO_NAME=$(awk -v a="$TARGET_GIT_REPO" 'BEGIN{print substr(a, index(a, "+git/") + 5)}')
19
41
SNAP_NAME=$(grep "name:" snapcraft.yaml | awk '{print $2}')
46
SNAP_NAME=$(grep "name:" snapcraft.yaml | awk '{print $2}')
20
42
SNAP_REV=$(git rev-parse --short HEAD)
47
SNAP_REV=$(git rev-parse --short HEAD)
25
43
CI_BRANCH=build/$SNAP_NAME-$BUILD_ID-$SNAP_REV
48
CI_REPO=$REPO_NAME-$BUILD_ID-$SNAP_REV
26
44
git checkout -b $CI_BRANCH
49
27
45
git remote add jenkins-ci git+ssh://system-enablement-ci-bot@git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-ci-builds
50
sed -i "s/~snappy-hwe-team\/snappy-hwe-snaps\/+git\/$REPO_NAME/~snappy-hwe-team\/snappy-hwe-snaps\/+git\/$CI_REPO/g" snapcraft.yaml
28
46
git push jenkins-ci $CI_BRANCH
51
git add snapcraft.yaml
29
52
git commit -m "jenkins-ci: Fix paths"
30
53
31
54
git remote add jenkins-ci git+ssh://system-enablement-ci-bot@git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$CI_REPO
32
55
git push jenkins-ci --all
33
56
git push jenkins-ci --tags
34
47
57
35
48
EXTRA_ARGS=
58
EXTRA_ARGS=
36
49
if [ -n "$ARCHITECTURES" ]; then
59
if [ -n "$ARCHITECTURES" ]; then
37
@@ -52,13 +62,13 @@ fi
38
52
62
39
53
$WORKSPACE/build-scripts/scripts/trigger-lp-build.py \
63
$WORKSPACE/build-scripts/scripts/trigger-lp-build.py \
40
54
    -s $SNAP_NAME -n \
64
    -s $SNAP_NAME -n \
42
55
    --git-repo=https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-ci-builds \
65
    --git-repo=https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$CI_REPO \
43
56
    --git-repo-branch=$CI_BRANCH \
66
    --git-repo-branch=$CI_BRANCH \
44
57
    --results-dir=$WORKSPACE/results \
67
    --results-dir=$WORKSPACE/results \
45
58
    $EXTRA_ARGS
68
    $EXTRA_ARGS
49
59
# When build has finished (regardless of its result) we remove our CI branch
69
# When build has finished remove the repository we just created
50
60
# to keep the CI repository clean.
70
$WORKSPACE/build-scripts/scripts/delete-ci-repo.py \
51
61
git push jenkins-ci :$CI_BRANCH
71
    --git-repo=https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$CI_REPO
52
62
if [ $? -ne 0 ]; then
72
if [ $? -ne 0 ]; then
53
63
    exit 1
73
    exit 1
54
64
fi
74
fi
55
diff --git a/scripts/delete-ci-repo.py b/scripts/delete-ci-repo.py
56
65
new file mode 100755
75
new file mode 100755
57
index 0000000..35c762d
58
--- /dev/null
59
+++ b/scripts/delete-ci-repo.py
60
@@ -0,0 +1,45 @@
61
1
#!/usr/bin/env python
62
2
#
63
3
# Copyright (C) 2017 Canonical Ltd
64
4
#
65
5
# This program is free software: you can redistribute it and/or modify
66
6
# it under the terms of the GNU General Public License version 3 as
67
7
# published by the Free Software Foundation.
68
8
#
69
9
# This program is distributed in the hope that it will be useful,
70
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
71
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
72
12
# GNU General Public License for more details.
73
13
#
74
14
# You should have received a copy of the GNU General Public License
75
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
76
16
77
17
from launchpadlib.launchpad import Launchpad
78
18
79
19
from argparse import ArgumentParser
80
20
81
21
import se_utils
82
22
83
23
print("Running delete-ci-repo")
84
24
85
25
parser = ArgumentParser(description="Delete a git repository stored in launchpad")
86
26
parser.add_argument('--git-repo', help="Git repository to be deleted")
87
27
88
28
args = vars(parser.parse_args())
89
29
90
30
git_repo = args['git_repo']
91
31
ind = git_repo.find('~')
92
32
if ind == -1:
93
33
    print("Bad git repo {}".format(git_repo))
94
34
    exit(1)
95
35
96
36
lp_repo = git_repo[ind:]
97
37
98
38
lp_app = se_utils.get_config_option("lp_app")
99
39
lp_env = se_utils.get_config_option("lp_env")
100
40
credential_store_path = se_utils.get_config_option('credential_store_path')
101
41
launchpad = se_utils.get_launchpad(None, credential_store_path, lp_app, lp_env)
102
42
103
43
repo = launchpad.git_repositories.getByPath(path=lp_repo)
104
44
print("Removing {}".format(lp_repo))
105
45
repo.lp_delete()
Status:	Merged
Approved by:	Simon Fels on 2017-03-07
Approved revision:	24d4ea9b0740f294e2d446a24f27d0c63ccabe9f
Merged at revision:	5582cd48aeef69a0cb6eed752360d62faf3c4279
Proposed branch:	~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts:build-from-master
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master
Diff against target:	105 lines (+63/-8) 2 files modified jobs/generic-build-snap-worker (+18/-8) scripts/delete-ci-repo.py (+45/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Simon Fels			Approve on 2017-03-07
Jim Hodapp (community)			Approve on 2017-03-07
System Enablement Bot	continuous-integration	2017-03-07	Approve on 2017-03-07
Review via email: mp+319169@code.launchpad.net