External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Retry chromium download in zuul

Browse Source
This commit is contained in:
Jake McDermott
2020-05-19 09:21:03 -04:00
parent 87e3d62684
commit 17efb34c6a
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -6,6 +6,7 @@ PACKER ?= packer
PACKER_BUILD_OPTS ?= -var 'official=$(OFFICIAL)' -var 'aw_repo_url=$(AW_REPO_URL)' PACKER_BUILD_OPTS ?= -var 'official=$(OFFICIAL)' -var 'aw_repo_url=$(AW_REPO_URL)'
NODE ?= node NODE ?= node
NPM_BIN ?= npm NPM_BIN ?= npm
CHROMIUM_BIN=/tmp/chrome-linux/chrome
DEPS_SCRIPT ?= packaging/bundle/deps.py DEPS_SCRIPT ?= packaging/bundle/deps.py
GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
MANAGEMENT_COMMAND ?= awx-manage MANAGEMENT_COMMAND ?= awx-manage
@@ -547,11 +548,13 @@ jshint: $(UI_DEPS_FLAG_FILE)
$(NPM_BIN) run --prefix awx/ui jshint $(NPM_BIN) run --prefix awx/ui jshint
$(NPM_BIN) run --prefix awx/ui lint $(NPM_BIN) run --prefix awx/ui lint
ui-zuul-lint-and-test: $(UI_DEPS_FLAG_FILE) ui-zuul-lint-and-test:
$(NPM_BIN) run --prefix awx/ui jshint CHROMIUM_BIN=$(CHROMIUM_BIN) ./awx/ui/build/zuul_download_chromium.sh
$(NPM_BIN) run --prefix awx/ui lint CHROMIUM_BIN=$(CHROMIUM_BIN) PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 $(NPM_BIN) --unsafe-perm --prefix awx/ui ci --no-save awx/ui
$(NPM_BIN) --prefix awx/ui run test:ci CHROMIUM_BIN=$(CHROMIUM_BIN) $(NPM_BIN) run --prefix awx/ui jshint
$(NPM_BIN) --prefix awx/ui run unit CHROMIUM_BIN=$(CHROMIUM_BIN) $(NPM_BIN) run --prefix awx/ui lint
CHROME_BIN=$(CHROMIUM_BIN) $(NPM_BIN) --prefix awx/ui run test:ci
CHROME_BIN=$(CHROMIUM_BIN) $(NPM_BIN) --prefix awx/ui run unit
# END UI TASKS # END UI TASKS
# -------------------------------------- # --------------------------------------

14
awx/ui/build/zuul_download_chromium.sh Executable file
View File

@@ -0,0 +1,14 @@
REVISION=588429
CHROMIUM_URL="https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/${REVISION}/chrome-linux.zip"
interval=30
retries=6
status=1
until [ $retries -eq 0 ] || [ $status -eq 0 ]; do
wget ${CHROMIUM_URL} -O /tmp/chrome-linux.zip
status=$?
sleep $interval
((retries--))
done
unzip -o -d /tmp /tmp/chrome-linux.zip

2
awx/ui/test/spec/karma.spec.js
View File

@@ -1,7 +1,7 @@
const path = require('path'); const path = require('path');
const webpackConfig = require('./webpack.spec'); const webpackConfig = require('./webpack.spec');
process.env.CHROME_BIN = require('puppeteer').executablePath(); process.env.CHROME_BIN = process.env.CHROME_BIN || require('puppeteer').executablePath();
const SRC_PATH = path.resolve(__dirname, '../../client/src'); const SRC_PATH = path.resolve(__dirname, '../../client/src');
const NODE_MODULES = path.resolve(__dirname, '../../node_modules'); const NODE_MODULES = path.resolve(__dirname, '../../node_modules');

2
awx/ui/test/unit/karma.unit.js
View File

@@ -1,7 +1,7 @@
const path = require('path'); const path = require('path');
const webpackConfig = require('../../build/webpack.test.js'); const webpackConfig = require('../../build/webpack.test.js');
process.env.CHROME_BIN = require('puppeteer').executablePath(); process.env.CHROME_BIN = process.env.CHROME_BIN || require('puppeteer').executablePath();
const SRC_PATH = path.resolve(__dirname, '../../client/src'); const SRC_PATH = path.resolve(__dirname, '../../client/src');

4
installer/roles/image_build/templates/Dockerfile.j2
View File

@@ -105,7 +105,9 @@ RUN dnf -y install \
nodejs \ nodejs \
nss \ nss \
make \ make \
patch && \ patch \
wget \
unzip && \
npm install -g n && n 10.15.0 && dnf remove -y nodejs npm install -g n && n 10.15.0 && dnf remove -y nodejs
{% endif %} {% endif %}