Commit graph

11 commits

Author SHA1 Message Date
Daniel Verkamp
ff783c3b7d docker: update ADHD commit to fix kokoro build
https://crrev.com/c/1856586 uses a new audio_streams interface but did
not update the revision used in kokoro/docker builds to match.  Update
it to fix the crosvm kokoro builder.

BUG=None
TEST=docker/wrapped_smoke_test.sh

Change-Id: I12fda23861aad4b5a12eda79298ac507382188a5
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1876831
Reviewed-by: Fletcher Woodruff <fletcherw@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
2019-10-25 23:54:12 +00:00
Daniel Verkamp
b05e3a5035 docker: add DRM to upgrade_checkout_commits.sh
The DRM repository was added to checkout_commits.env without a
corresponding addition in upgrade_checkout_commits.sh.  Add it and
upgrade all repositories.

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Iee7ae7005284cb3b7d0e8e8c983d4ef381781f8e
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1863821
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
2019-10-22 00:09:24 +00:00
Jianxun Zhang
a462f74b26 docker: fix a failure when building crosvm
What fixed by this change failed crosvm build with docker on
non-Nvidia platforms.

BUG=None
TEST=./build_crosvm_base.sh
./build_crosvm.sh
./wrapped_smoke_test.sh

Change-Id: Ib2cc70d5bd98bcad25410ba54c0492491a3ea799
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1842519
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2019-10-10 18:33:47 +00:00
Jianxun Zhang
34533fe3ee docker: fix minigbm failure when building base image
Running ./build_crosvm_base.sh failed with the below error:

...
/scratch/minigbm/helpers.c: In function 'layout_from_format':
/scratch/minigbm/helpers.c:156:7: error: \
'DRM_FORMAT_ABGR16161616F' undeclared (first use in this function)
  case DRM_FORMAT_ABGR16161616F:
...

The header file in the libdrm-dev package from debian distro hasn't
included the missed macro. This change builds libdrm from the
upstream source to fix the issue.

BUG=None
TEST=./build_crosvm_base.sh
echo $?

Change-Id: Ifaae4313781ea02ebac9658ab8be9d990a3d5d25
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1841890
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2019-10-10 18:33:45 +00:00
Zach Reizner
971589f7ec docker: make using X11 gpu display easier with docker
This change makes using docker a bit easier when displaying on the hosts
X11 server. The biggest change was that build_crosvm.sh will install the
hosts NVIDIA proprietary driver if needed.

TEST=docker/build_crosvm.sh
     docker/crosvm_wrapper.sh
BUG=None

Change-Id: If64074715b0ad3a06727a4cc764d3ac06c4dfece
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1759139
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
2019-08-28 22:59:34 +00:00
Gurchetan Singh
84d59e76b3 Dockerfile: stop tracking virglrenderer master
With crrev.com/c/1745316, the regular ChromeOS build started
adding epatches to virglrenderer. Therefore, don't track virglrenderer
master for the time being, until we can upstream and/or remove our
downstream APIs.

BUG=chromium:906811
TEST=docker/wrapped_smoke_test.sh

Change-Id: I9567e9286130048fb793fecb4ff3801b7d64ddba
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1758371
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
2019-08-20 17:46:23 +00:00
Jianxun Zhang
7f855be1f9 docker: support passing extra arguments to scripts
One of the usages is to specify proxy setting so
that these scripts can download packages behind
proxies. It looks cleaner and more flexible than
tweaking the docker file that's checked in the repo.

BUG=None
TEST=run commands behind a network proxy
./build_crosvm_base.sh --build-arg http_proxy --build-arg https_proxy
./build_crosvm.sh --build-arg http_proxy --build-arg https_proxy
./wrapped_smoke_test.sh -e http_proxy -e https_proxy

Change-Id: Id3729a1343b12c1c7553e047701f770620e3c975
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1737540
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
2019-08-07 23:31:48 +00:00
Daniel Verkamp
a08e40bf81 rust-toolchain: upgrade to Rust 1.36.0
Update the rust-toolchain file and Docker image used in kokoro to match
the Chrome OS toolchain.

BUG=None
TEST=docker/wrapped_smoke_test.sh

Change-Id: I95cbf9bcaadd49b8476f2829bc75958dbea304e3
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1724850
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
2019-07-30 05:35:31 +00:00
Zach Reizner
6a0bfb037a docker: add adhd to checkout_commits.env and update all commits
This change also includes some code that was missing from
upgrade_checkout_commits.sh that actually generated the new
checkout_commits.env.

BUG=None
TEST=kokoro/kokoro_simulator.sh
     docker/build_crosvm_base.sh
     docker/build_crosvm.sh

Change-Id: If2505dd9af060d15c36eaf54741d4ae371f6a3c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1641585
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
2019-06-04 00:46:18 +00:00
Daniel Verkamp
99c65d41f8 rust-toolchain: upgrade to Rust 1.35.0
BUG=None
TEST=docker/wrapped_smoke_test.sh

Change-Id: I0a159d9b54d97098d633ce80b92eeb48eb5c4b55
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1632036
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
2019-05-30 01:11:13 +00:00
Zach Reizner
6868c0a72f add docker supported builds and tests
BUG=None
TEST=docker/build_crosvm_base.sh
     docker/build_crosvm.sh
     docker/wrapped_smoke_test.sh
     docker/crosvm_wrapper.sh
     kokoro/kokoro_simulator.sh
     bin/smoke_test

Change-Id: I55a805ba6326c3c58973d1fe21172a5e3551c1e2
Reviewed-on: https://chromium-review.googlesource.com/1593723
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
2019-05-15 13:36:19 -07:00