aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xjenkins-scripts/basic_settings.sh4
-rw-r--r--jjb/ci-AGL-verify/ci-platform-jjb.yaml4
-rw-r--r--jjb/common/.include-agl-build.sh2
-rw-r--r--jjb/common/include-agl-auto-conf.sh2
-rw-r--r--jjb/common/include-agl-bitbake-image-fake.sh2
-rw-r--r--jjb/common/include-agl-header.sh2
-rw-r--r--jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh2
-rw-r--r--packer/provision/agl_dependencies.sh26
-rw-r--r--packer/provision/agl_mirror.sh4
9 files changed, 30 insertions, 18 deletions
diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh
index da45107e..3aefc9e2 100755
--- a/jenkins-scripts/basic_settings.sh
+++ b/jenkins-scripts/basic_settings.sh
@@ -25,8 +25,8 @@ FQDN=$(facter fqdn)
echo "${IPADDR} ${HOSTNAME} ${FQDN}" >> /etc/hosts
cat <<EOFHOSTS >> /etc/hosts
-# workaround for download-new
-199.19.213.77 download-new.automotivelinux.org
+# workaround for download
+199.19.213.77 download.automotivelinux.org
EOFHOSTS
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 7f800c13..54265ab8 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -443,11 +443,7 @@
publishers:
- naginator:
- rerun-unstable-builds: true
- progressive-delay-increment: 5
- progressive-delay-maximum: 15
max-failed-builds: 2
- #regular-expression: "Unexpected termination of the channel"
#
diff --git a/jjb/common/.include-agl-build.sh b/jjb/common/.include-agl-build.sh
index 25873455..8a27b8f4 100644
--- a/jjb/common/.include-agl-build.sh
+++ b/jjb/common/.include-agl-build.sh
@@ -7,7 +7,7 @@ set -e
# VARIABLES
OPTIND=1
-export DLHOST="https://download-new.automotivelinux.org/"
+export DLHOST="https://download.automotivelinux.org/"
export NOGFX=false
export VERBOSE=false
export DEBUG=false
diff --git a/jjb/common/include-agl-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh
index 09a237d6..5d9529de 100644
--- a/jjb/common/include-agl-auto-conf.sh
+++ b/jjb/common/include-agl-auto-conf.sh
@@ -5,7 +5,7 @@
## auto.conf inclusion of mirrors
################################################################################
-export DLHOST="http://download-new.automotivelinux.org/"
+export DLHOST="http://download.automotivelinux.org/"
#limit parallel number of bitbake jobs and parallel jobs in make
cat << EOF >> conf/auto.conf
PREMIRRORS = "\
diff --git a/jjb/common/include-agl-bitbake-image-fake.sh b/jjb/common/include-agl-bitbake-image-fake.sh
index 47eca230..7cd81c12 100644
--- a/jjb/common/include-agl-bitbake-image-fake.sh
+++ b/jjb/common/include-agl-bitbake-image-fake.sh
@@ -26,7 +26,7 @@ mkdir -p tmp/deploy/images/${MACHINE}/
pushd tmp/deploy/images/${MACHINE}/
for i in DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT ; do
- eval curl -o "$(echo "$"${i})" "http://download-new.automotivelinux.org/AGL/snapshots/master/2017-01-08-b241/${MACHINE}/deploy/images/${MACHINE}/$(echo "$"${i})"
+ eval curl -o "$(echo "$"${i})" "http://download.automotivelinux.org/AGL/snapshots/master/2017-01-08-b241/${MACHINE}/deploy/images/${MACHINE}/$(echo "$"${i})"
ls -alh
done
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index 34140513..bee2c939 100644
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -12,7 +12,7 @@ set -e
# VARIABLES
OPTIND=1
-#export DLHOST="http://download-new.automotivelinux.org/"
+#export DLHOST="http://download.automotivelinux.org/"
# DLHOST in auto.conf
export NOGFX=false
export VERBOSE=false
diff --git a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
index 25873455..8a27b8f4 100644
--- a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
+++ b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
@@ -7,7 +7,7 @@ set -e
# VARIABLES
OPTIND=1
-export DLHOST="https://download-new.automotivelinux.org/"
+export DLHOST="https://download.automotivelinux.org/"
export NOGFX=false
export VERBOSE=false
export DEBUG=false
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index f09343bf..3516a022 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -32,14 +32,14 @@ sudo usermod -a -G docker ubuntu
cat <<EOFHOSTS >> /etc/hosts
-# workaround for download-new
-10.30.72.8 download-new.automotivelinux.org
+# workaround for download
+10.30.72.8 download.automotivelinux.org
10.30.72.8 download-internal.automotivelinux.org
EOFHOSTS
# install newer version of jjb ... fixes issues with rendering
-sudo pip install --upgrade --force-reinstall -v jenkins-job-builder
+sudo pip install --upgrade --force-reinstall -v jenkins-job-builder
cat <<EOFSYSCTL >> /etc/sysctl.conf
# we have a lot of make jobs, this helps a lot
@@ -57,6 +57,20 @@ vm.dirty_writeback_centisecs = 0
EOFSYSCTL
### webdocs
+# taken from container setup script. not documented in readme.
+# install node.js and tools (npm, gulp, bower) if needed
+#
+if [[ -z $(which node) ]]; then
+ curl -sL https://deb.nodesource.com/setup_6.x | bash -
+ apt-get install -y nodejs
+ npm install --global gulp bower
+fi
+
+# tools used to generate developer website (https://github.com/automotive-grade-linux/docs-agl)
+gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \
+ && curl -sSL https://get.rvm.io | bash -s stable --ruby --gems=jekyll
+
+
mkdir -p /opt/AGL
cd /opt/AGL/
#mkdir webdocs
@@ -70,9 +84,11 @@ npm install
#gem install --no-user-install -V kramdown
#gem install --no-user-install -V jekyll-plantuml
-gem install --no-user-install -V --version 3.1.6 jekyll
-gem install --no-user-install -V --version 1.13.1 kramdown
+#gem install --no-user-install -V --version 3.1.6 jekyll
+#gem install --no-user-install -V --version 1.13.1 kramdown
### hope that is enough
+
+
exit 0
diff --git a/packer/provision/agl_mirror.sh b/packer/provision/agl_mirror.sh
index cfeeee3c..a61090a8 100644
--- a/packer/provision/agl_mirror.sh
+++ b/packer/provision/agl_mirror.sh
@@ -12,12 +12,12 @@ cd
#mirror sstate-cache into /opt/AGL/sstate-mirror
mkdir -p /opt/AGL/sstate-mirror
cd /opt/AGL/sstate-mirror
-wget --mirror -np -nH --convert-links "http://download-new.automotivelinux.org/sstate-mirror/" -A siginfo -A tgz --cut-dirs=1
+wget --mirror -np -nH --convert-links "http://download.automotivelinux.org/sstate-mirror/" -A siginfo -A tgz --cut-dirs=1
cd
#mirror downloads into /opt/AGL/premirror
mkdir -p /opt/AGL/premirror
cd /opt/AGL/premirror
-wget --mirror -r -l1 -np -nH --convert-links "http://download-new.automotivelinux.org/AGL/mirror/" -R 'done' -R 'O=A,O=D' --cut-dirs=2
+wget --mirror -r -l1 -np -nH --convert-links "http://download.automotivelinux.org/AGL/mirror/" -R 'done' -R 'O=A,O=D' --cut-dirs=2
cd