Permalink
Browse files

Merge pull request #24 from strikead/develop

sync with develop
  • Loading branch information...
2 parents 8ab6934 + ef8c1be commit abba23a92342d8ef990cefdd3c2da6664d9223c2 @AnderEnder AnderEnder committed on GitHub Jan 2, 2017
View
6 README
@@ -78,6 +78,12 @@ Yabs can be updated:
zypper up strikead-yabs
+Private zypper repos are required to have installed credentials configuration file: /etc/yabs/zypp-credentials.cat
+
+[http://example.com/path]
+username=
+password=
+
----------------------------------------------------------------------
6. Build vagrant box from scratch
@@ -1,6 +1,6 @@
http://mirror.strikead.com/oss/suse
http://mirror.strikead.com/update
-http://mirror.strikead.com/erlang
-http://mirror.strikead.com/ldan86
-http://rpm.strikead.com/release/12.2/strikead/stable/
-http://rpm.strikead.com/release/12.2/strikead/experimental/
+https://artifactory.strikead.com/list/opensuse-discontinued/distribution/12.2/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-discontinued/update/12.2
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/experimental-12.2
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-12.2
@@ -1,6 +1,4 @@
-http://download.opensuse.org/distribution/13.1/repo/oss/
-http://download.opensuse.org/distribution/13.1/repo/non-oss/
-http://download.opensuse.org/update/13.1/
-http://download.opensuse.org/update/13.1-non-oss/
-http://rpm.strikead.com/release/13.1/strikead/stable/
-http://rpm.strikead.com/release/13.1/strikead/experimental/
+https://artifactory.strikead.com/list/opensuse-distribution/13.1/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-update/13.1
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-13.1/
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/experimental-13.1/
@@ -1,6 +1,4 @@
-http://download.opensuse.org/distribution/13.2/repo/oss/
-http://download.opensuse.org/distribution/13.2/repo/non-oss/
-http://download.opensuse.org/update/13.2/
-http://download.opensuse.org/update/13.2-non-oss/
-http://rpm.strikead.com/release/13.2/strikead/stable/
-http://rpm.strikead.com/release/13.2/strikead/experimental/
+https://artifactory.strikead.com/list/opensuse-distribution/13.2/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-update/13.2
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-13.2
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/experimental-13.2
@@ -1,4 +1,5 @@
http://mirror.strikead.com/oss/suse
http://mirror.strikead.com/update
-http://mirror.strikead.com/erlang
-http://rpm.strikead.com/release/12.2/strikead/stable/
+https://artifactory.strikead.com/list/opensuse-discontinued/distribution/12.2/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-discontinued/update/12.2
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-12.2/
@@ -1,5 +1,3 @@
-http://download.opensuse.org/distribution/13.1/repo/oss/
-http://download.opensuse.org/distribution/13.1/repo/non-oss/
-http://download.opensuse.org/update/13.1/
-http://download.opensuse.org/update/13.1-non-oss/
-http://rpm.strikead.com/release/13.1/strikead/stable/
+https://artifactory.strikead.com/list/opensuse-distribution/13.1/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-update/13.1
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-13.1/
@@ -1,5 +1,3 @@
-http://download.opensuse.org/distribution/13.2/repo/oss/
-http://download.opensuse.org/distribution/13.2/repo/non-oss/
-http://download.opensuse.org/update/13.2/
-http://download.opensuse.org/update/13.2-non-oss/
-http://rpm.strikead.com/release/13.2/strikead/stable/
+https://artifactory.strikead.com/list/opensuse-distribution/13.2/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-update/13.2
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-13.2/
@@ -1,5 +1,7 @@
http://mirror.strikead.com/oss/suse
http://mirror.strikead.com/update
-http://mirror.strikead.com/erlang
-http://rpm.strikead.com/release/12.2/strikead/stable/
-http://rpm.strikead.com/release/12.2/strikead/unstable/
+https://artifactory.strikead.com/list/opensuse-discontinued/distribution/12.2/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-discontinued/update/12.2
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-12.2/
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/experimental-12.2/
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/unstable-12.2/
@@ -1,6 +1,4 @@
-http://download.opensuse.org/distribution/13.1/repo/oss/
-http://download.opensuse.org/distribution/13.1/repo/non-oss/
-http://download.opensuse.org/update/13.1/
-http://download.opensuse.org/update/13.1-non-oss/
-http://rpm.strikead.com/release/13.1/strikead/stable/
-http://rpm.strikead.com/release/13.1/strikead/unstable/
+https://artifactory.strikead.com/list/opensuse-distribution/13.1/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-update/13.1
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-13.1/
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/unstable-13.1/
@@ -1,6 +1,4 @@
-http://download.opensuse.org/distribution/13.2/repo/oss/
-http://download.opensuse.org/distribution/13.2/repo/non-oss/
-http://download.opensuse.org/update/13.2/
-http://download.opensuse.org/update/13.2-non-oss/
-http://rpm.strikead.com/release/13.2/strikead/stable/
-http://rpm.strikead.com/release/13.2/strikead/unstable/
+https://artifactory.strikead.com/list/opensuse-distribution/13.2/repo/oss/suse
+https://artifactory.strikead.com/list/opensuse-update/13.2
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/stable-13.2/
+https://artifactory.strikead.com/list/strikead-opensuse/strikead/unstable-13.2/
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-experimental-122.list"
# Minimal set of packages for chroot
MINIMAL_SET="pwdutils rpm-build gzip tar findutils gawk"
+
+# Skip local repo creation
+SKIP_REPO=1
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-experimental-131.list"
# Minimal set of packages for chroot
MINIMAL_SET="shadow rpm-build gzip tar findutils gawk coreutils"
+
+# Skip local repo creation
+SKIP_REPO=1
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-experimental-132.list"
# Minimal set of packages for chroot
MINIMAL_SET="shadow rpm-build gzip tar findutils gawk coreutils"
+
+# Skip local repo creation
+SKIP_REPO=1
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-stable-122.list"
# Minimal set of packages for chroot
MINIMAL_SET="pwdutils rpm-build gzip tar findutils gawk coreutils"
+
+# Skip local repo creation
+SKIP_REPO=1
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-stable-131.list"
# Minimal set of packages for chroot
MINIMAL_SET="shadow rpm-build gzip tar findutils gawk coreutils"
+
+# Skip local repo creation
+SKIP_REPO=1
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-stable-132.list"
# Minimal set of packages for chroot
MINIMAL_SET="shadow rpm-build gzip tar findutils gawk coreutils"
+
+# Skip local repo creation
+SKIP_REPO=1
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-unstable-122.list"
# Minimal set of packages for chroot
MINIMAL_SET="pwdutils rpm-build gzip tar findutils gawk coreutils"
+
+# Skip local repo creation
+SKIP_REPO=1
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-unstable-131.list"
# Minimal set of packages for chroot
MINIMAL_SET="shadow rpm-build gzip tar findutils gawk coreutils"
+
+# Skip local repo creation
+SKIP_REPO=1
@@ -9,3 +9,6 @@ REPO_LIST="/etc/yabs/repo-unstable-132.list"
# Minimal set of packages for chroot
MINIMAL_SET="shadow rpm-build gzip tar findutils gawk coreutils"
+
+# Skip local repo creation
+SKIP_REPO=1
View
@@ -60,6 +60,9 @@ install --mode=440 sudoers %buildroot%_sysconfdir/sudoers.d/%realname
%_sbindir/*
%changelog
+* Mon Jan 2 2017 Vladyslav Boridko <vladyslav.boridko@strikead.com> 1.8.0
+- [EN-7718] Add sbt credentials
+
* Fri Jul 3 2016 Andrii Radyk <andrii.radyk@strikead.com> 1.3.0
- [EN-2003] refactoring and adding environment specific dependency check with rpm macros support
View
@@ -1 +1 @@
-1.5.0
+1.8.0
View
@@ -156,6 +156,17 @@ tar tf "$SOURCESDIR"/"$PKGTAR" || \
## ---------------------------------------------
## register package repos...
+## Add credentials for private repos
+if [ -f /etc/yabs/zypp-credentials.cat ]; then
+ mkdir -p "$ROOTFS/etc/zypp"
+ cp /etc/yabs/zypp-credentials.cat "$ROOTFS/etc/zypp/credentials.cat"
+fi
+
+if [ -f /etc/yabs/sbt-credentials.sbt ]; then
+ mkdir -p "$ROOTFS/usr/src/packages/.sbt/0.13/plugins"
+ cp /etc/yabs/sbt-credentials.sbt "$ROOTFS/usr/src/packages/.sbt/0.13/plugins/credentials.sbt"
+fi
+
for URL in `cat "$REPO_LIST"`; do
max=5
@@ -248,6 +259,7 @@ chroot "$ROOTFS" su --login \
RUNDIR=`pwd`
cd "$ROOTFS"/usr/src/packages/RPMS
cp --recursive --parents --force . "$DSTDIR"/RPMS/
+chown -R $SUDO_USER "$DSTDIR"/RPMS
# Upload to artifactory using configured jfrog-cli
if [ -f /usr/bin/jfrog-cli ] && [ -f ~/.jfrog/jfrog-cli.conf ] && [ "$ART_REPO" ]; then
View
@@ -38,7 +38,9 @@ else
fi
if [ "$SKIP_REPO" ]; then
- TARGETDIR="$RUNDIR/target"
+ RUNDIR2=`pwd`
+ WORKSPACE="${WORKSPACE:-$RUNDIR2}"
+ TARGETDIR="$WORKSPACE/target"
else
TARGETDIR=$REPO
fi

0 comments on commit abba23a

Please sign in to comment.