Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
branch = master
[submodule "bitbake"]
path = bitbake
url = http://git.openembedded.org/bitbake
url = http://github.com/pohly/bitbake.git
branch = master
[submodule "meta-intel"]
path = meta-intel
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def checkout_content(is_pr, pr_num) {

def build_docker_image(image_name) {
// Base container OS to use, see docker configs in docker/
def build_os = "opensuse-42.2"
def build_os = "crops-yocto-ubuntu-16"
def build_args = [ build_proxy_args(), build_user_args()].join(" ")
sh "docker build -t ${image_name} ${build_args} docker/${build_os}"
dockerFingerprintFrom dockerfile: "docker/${build_os}/Dockerfile", image: "${image_name}"
Expand Down
2 changes: 1 addition & 1 deletion bitbake
Submodule bitbake updated 1 files
+15 −2 lib/bb/fetch2/wget.py
4 changes: 4 additions & 0 deletions docker/build-common-util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,7 @@ auto_conf_testsdk() {
INHERIT += "testsdk"
EOF
}

auto_dump() {
grep -n '.*' conf/*.conf
}
1 change: 1 addition & 0 deletions docker/build-project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ if [ ! -z ${JOB_NAME+x} ]; then
# in CI run only:
auto_conf_buildhistory
fi
auto_dump

export BUILD_ID=${CI_BUILD_ID}
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID"
Expand Down
28 changes: 28 additions & 0 deletions docker/crops-yocto-ubuntu-16/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM crops/yocto:ubuntu-16.04-base

# non-default docker proxy vars
ARG ALL_PROXY
ARG socks_proxy
ARG SOCKS_PROXY

ENV JENKINS_HOME /var/lib/jenkins

ARG user=jenkins
ARG group=jenkins
ARG uid=1000
ARG gid=1000

USER root

#RUN apt-get install -y python3-unittest2 python3-six
RUN apt-get install -y python3-pip
RUN pip3 install unittest-xml-reporting


RUN groupadd -o -g ${gid} ${group} \
&& useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}

# VOLUME ${JENKINS_HOME}

USER jenkins
WORKDIR ${JENKINS_HOME}
2 changes: 1 addition & 1 deletion docker/local-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi
CURRENT_PROJECT=refkit
BUILD_DIR=${BUILD_DIR:-${WORKSPACE}/build}
BUILD_CACHE_DIR=$BUILD_DIR/bb-cache
BUILDOS="opensuse-42.2"
BUILDOS="crops-yocto-ubuntu-16"
GIT_PROXY_COMMAND=oe-git-proxy
TARGET_MACHINE="intel-corei7-64"

Expand Down
2 changes: 1 addition & 1 deletion docker/post-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ set -u

# create auto.conf using functions in build-common-util.sh
auto_conf_common

auto_conf_testsdk
auto_dump

# post-build testing builds images but only .wic is sufficient
# (default in IMAGE_FSTYPES). We skip compression and bmap formats
Expand Down
1 change: 1 addition & 0 deletions docker/pre-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ set -u

# create auto.conf using functions in build-common-util.sh
auto_conf_common
auto_dump

export BUILD_ID=${CI_BUILD_ID}
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID"
Expand Down