bug(nimbus): docker selenium build fix (#10547)
Because - Our conditional builds for our firefox docker images weren't working correctly. This commit - Removes the logic just to build them once a week Fixes #10546
This commit is contained in:
Родитель
3c0972804f
Коммит
d735d8fa7e
|
@ -571,54 +571,16 @@ jobs:
|
||||||
username: $DOCKER_USER
|
username: $DOCKER_USER
|
||||||
password: $DOCKER_PASS
|
password: $DOCKER_PASS
|
||||||
- run:
|
- run:
|
||||||
name: Check for Firefox Update
|
name: Build and upload images
|
||||||
command: |
|
|
||||||
set +e
|
|
||||||
docker pull ${DOCKERHUB_REPO}:nimbus-firefox-beta
|
|
||||||
docker run -d --name firefox-beta ${DOCKERHUB_REPO}:nimbus-firefox-beta
|
|
||||||
docker_id=$(docker ps -aqf "name=^firefox-beta")
|
|
||||||
docker cp $docker_id:/old_versions.txt /home/circleci/experimenter/old_versions.txt
|
|
||||||
results=$(sudo ./.circleci/get_firefox_versions.sh)
|
|
||||||
DIFF=$(diff /home/circleci/experimenter/new_versions.txt /home/circleci/experimenter/old_versions.txt)
|
|
||||||
if [ ! "$DIFF" ]; then
|
|
||||||
echo "No Firefox Version Changes found!"
|
|
||||||
circleci-agent step halt
|
|
||||||
fi
|
|
||||||
- run:
|
|
||||||
name: Get Firefox Versions
|
|
||||||
command: |
|
command: |
|
||||||
git clone --depth=1 git@github.com:SeleniumHQ/docker-selenium.git
|
git clone --depth=1 git@github.com:SeleniumHQ/docker-selenium.git
|
||||||
cd docker-selenium
|
cd docker-selenium
|
||||||
if echo "$results" | grep -q "BETA"; then
|
|
||||||
BUILD_ARGS="--build-arg FIREFOX_VERSION=devedition-latest" VERSION="firefox" BUILD_DATE="beta" make standalone_firefox
|
|
||||||
fi
|
|
||||||
if echo "$results" | grep -q "RELEASE"; then
|
|
||||||
BUILD_ARGS="--build-arg FIREFOX_VERSION=latest" VERSION="firefox" BUILD_DATE="release" make standalone_firefox
|
|
||||||
fi
|
|
||||||
- run:
|
|
||||||
name: Save Images
|
|
||||||
command: |
|
|
||||||
results=$(sudo ./.circleci/get_firefox_versions.sh)
|
|
||||||
mv /home/circleci/experimenter/new_versions.txt /home/circleci/experimenter/old_versions.txt
|
|
||||||
cd docker-selenium
|
|
||||||
BUILD_ARGS="--build-arg FIREFOX_VERSION=latest" VERSION="firefox" BUILD_DATE="release" make standalone_firefox
|
BUILD_ARGS="--build-arg FIREFOX_VERSION=latest" VERSION="firefox" BUILD_DATE="release" make standalone_firefox
|
||||||
BUILD_ARGS="--build-arg FIREFOX_VERSION=devedition-latest" VERSION="firefox" BUILD_DATE="beta" make standalone_firefox
|
BUILD_ARGS="--build-arg FIREFOX_VERSION=devedition-latest" VERSION="firefox" BUILD_DATE="beta" make standalone_firefox
|
||||||
# Save release
|
docker tag selenium/standalone-firefox:firefox-release ${DOCKERHUB_REPO}:nimbus-firefox-release
|
||||||
docker run -d --name firefox-release-build selenium/standalone-firefox:firefox-release
|
docker tag selenium/standalone-firefox:firefox-beta ${DOCKERHUB_REPO}:nimbus-firefox-beta
|
||||||
docker_id=$(docker ps -aqf "name=^firefox-release-build")
|
|
||||||
docker cp /home/circleci/experimenter/old_versions.txt $docker_id:/old_versions.txt
|
|
||||||
docker commit $docker_id ${DOCKERHUB_REPO}:nimbus-firefox-release
|
|
||||||
# Save Dev
|
|
||||||
docker run -d --name firefox-beta-build selenium/standalone-firefox:firefox-beta
|
|
||||||
docker_id=$(docker ps -aqf "name=^firefox-beta-build")
|
|
||||||
docker cp /home/circleci/experimenter/old_versions.txt $docker_id:/old_versions.txt
|
|
||||||
docker commit $docker_id ${DOCKERHUB_REPO}:nimbus-firefox-beta
|
|
||||||
docker push ${DOCKERHUB_REPO}:nimbus-firefox-beta
|
docker push ${DOCKERHUB_REPO}:nimbus-firefox-beta
|
||||||
docker push ${DOCKERHUB_REPO}:nimbus-firefox-release
|
docker push ${DOCKERHUB_REPO}:nimbus-firefox-release
|
||||||
- save_cache:
|
|
||||||
key: version-cache-{{ checksum "old_versions.txt" }}
|
|
||||||
paths:
|
|
||||||
- /home/circleci/experimenter/old_versions.txt
|
|
||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
build_firefox:
|
build_firefox:
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
#!/bin/bash -x
|
|
||||||
set -e
|
|
||||||
|
|
||||||
OUTPUT=/home/circleci/experimenter
|
|
||||||
touch $OUTPUT/new_versions.txt
|
|
||||||
VERSIONS_FILE=$OUTPUT/new_versions.txt
|
|
||||||
|
|
||||||
# Firefox
|
|
||||||
apt-get update
|
|
||||||
FIREFOX_RELEASE_PKG=$(apt-cache madison firefox | head -n1 | awk '{ print $3 }')
|
|
||||||
FIREFOX_RELEASE_VER=$(echo $FIREFOX_PKG | cut -d"." -f1)
|
|
||||||
|
|
||||||
# Firefox Beta
|
|
||||||
add-apt-repository --yes ppa:mozillateam/firefox-next && apt-get update
|
|
||||||
FIREFOX_BETA_PKG=$(apt-cache madison firefox | head -n1 | awk '{ print $3 }')
|
|
||||||
FIREFOX_BETA_VER=$(echo $FIREFOX_BETA_PKG | cut -d"." -f1)
|
|
||||||
|
|
||||||
|
|
||||||
# OUTPUT
|
|
||||||
echo FIREFOX_PKG=$FIREFOX_RELEASE_PKG > $VERSIONS_FILE
|
|
||||||
echo FIREFOX_VER=$FIREFOX_RELEASE_VER >> $VERSIONS_FILE
|
|
||||||
echo FIREFOX_BETA_VER=$FIREFOX_BETA_VER >> $VERSIONS_FILE
|
|
||||||
echo FIREFOX_BETA_PKG=$FIREFOX_BETA_PKG >> $VERSIONS_FILE
|
|
||||||
|
|
||||||
cat $VERSIONS_FILE
|
|
||||||
|
|
||||||
chmod -R 777 $OUTPUT
|
|
Загрузка…
Ссылка в новой задаче