diff options
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 3 | ||||
| -rw-r--r-- | jjb/common/include-agl-auto-conf.sh | 4 | ||||
| -rw-r--r-- | jjb/common/include-agl-header.sh | 7 | ||||
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 5 | ||||
| -rw-r--r-- | packer/provision/agl_hwtest_dependencies.sh | 5 |
5 files changed, 18 insertions, 6 deletions
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 203effb4..34b3dff4 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -16,7 +16,6 @@ templates: - basebuild-agl-test-slave - basebuild-control-slave - - basebuild - job-template: name: ci-management-verify-jjb @@ -172,7 +171,7 @@ - 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8' - ansicolor - openstack: - single-use: false + single-use: true triggers: - timed: '00 10 1 * *' diff --git a/jjb/common/include-agl-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh index 2d3e96bf..20f5d9fb 100644 --- a/jjb/common/include-agl-auto-conf.sh +++ b/jjb/common/include-agl-auto-conf.sh @@ -42,7 +42,7 @@ fi # PRSERV and HASHSERV for CI # but only starting with dunfell / master -> soon jellyfish -if test x"master" = x"${DISTROBRANCH}" -o test -x"jellyfish" = x"${DISTROBRANCH}" ; then +if test x"master" = x"${DISTROBRANCH}" -o x"jellyfish" = x"${DISTROBRANCH}" ; then export PRHASHSERV="10.30.72.18" cat << EOF >> conf/auto.conf @@ -53,4 +53,4 @@ BB_SIGNATURE_HANDLER = "OEEquivHash" PRSERV_HOST = "${PRHASHSERV}:8585" EOF -fi
\ No newline at end of file +fi diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh index 6e118837..02e9cb92 100644 --- a/jjb/common/include-agl-header.sh +++ b/jjb/common/include-agl-header.sh @@ -159,6 +159,13 @@ if test x"h3ulcb-nogfx" = x"$MACHINE"; then export TARGETSDKIMAGE="agl-image-ivi-crosssdk" fi +if test x"raspberrypi4" = x"${MACHINE}" -a x"master" = x"${TARGETBRANCH}" ; then + export TARGETMACHINE="raspberrypi4-64" +fi +if test x"raspberrypi4" = x"${MACHINE}" -a x"jellyfish" = x"${TARGETBRANCH}" ; then + export TARGETMACHINE="raspberrypi4-64" +fi + #if $DEBUG; then set | grep ^TARGET || true set | grep ^GERRIT || true diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index c95f12cc..9e2578cd 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -32,7 +32,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \ tree rsync python-yaml python-requests curl tar docker.io pandoc python3 \ ruby-all-dev ruby-ffi ruby-ffi-* jekyll ruby-redcarpet mkdocs \ python-pip python-simplejson g++-multilib make zip unzip iperf3 \ - debian-keyring debian-archive-keyring python3-yaml python3-jinja2 + debian-keyring debian-archive-keyring python3-yaml pyhton3-pip DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1 @@ -126,10 +126,13 @@ sudo pip install mdlint # releng-scripts needs latest (stable v2.9) jinja2 sudo pip install --force-reinstall --ignore-installed jinja2 sudo pip install --upgrade jinja2 +sudo pip3 install --force-reinstall --ignore-installed jinja2 +sudo pip3 install --upgrade jinja2 python -c "import sys; print sys.path" sudo pip show jinja2 +sudo pip3 show jinja2 # install go for xds build diff --git a/packer/provision/agl_hwtest_dependencies.sh b/packer/provision/agl_hwtest_dependencies.sh index 85b9e3ed..44688a6d 100644 --- a/packer/provision/agl_hwtest_dependencies.sh +++ b/packer/provision/agl_hwtest_dependencies.sh @@ -28,7 +28,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \ apt-get -y install wget python-pip zip unzip iperf3 \ debian-keyring debian-archive-keyring \ - python3-jinja2 python3-yaml + python3-pip python3-yaml DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1 @@ -71,10 +71,13 @@ EOFSYSCTL # releng-scripts needs latest (stable v2.9) jinja2 sudo pip install --force-reinstall --ignore-installed jinja2 sudo pip install --upgrade jinja2 +sudo pip3 install --force-reinstall --ignore-installed jinja2 +sudo pip3 install --upgrade jinja2 python -c "import sys; print sys.path" sudo pip show jinja2 +sudo pip3 show jinja2 # install go for xds build |