Skip to content

Commit ad9d08b

Browse files
dwallacelfdwallacelf
committed
ci(docker): update docker executor build scripts
- refactor build scripts to run from github.com/fdio/.github repository Change-Id: I5d13e4dac8d4914b84056d6dcb9acee35774a4b3 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
1 parent c2df5c7 commit ad9d08b

10 files changed

Lines changed: 39 additions & 83 deletions

‎docker/scripts/build_executor_docker_image.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ logname="/tmp/$(basename $0).${DOCKER_DATE}.log"
2121
echo -e "\n*** Logging output to $logname ***\n\n"
2222
exec > >(tee -a $logname) 2>&1
2323

24-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
25-
. "$CIMAN_DOCKER_SCRIPTS/lib_vpp.sh"
26-
. "$CIMAN_DOCKER_SCRIPTS/lib_csit.sh"
27-
. "$CIMAN_DOCKER_SCRIPTS/lib_apt.sh"
24+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
25+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_vpp.sh"
26+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_csit.sh"
27+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_apt.sh"
2828

2929
all_os_names=""
3030
ci_tag=""
@@ -120,7 +120,7 @@ docker_build_setup_gha() {
120120
if [ -n "$gha_container" ] && vpp_supported_executor_class ; then
121121
rm -rf "$DOCKER_GHA_RUNNER_DIR"
122122
mkdir -p "$DOCKER_GHA_RUNNER_DIR"
123-
cp "$DOCKER_CIMAN_GHA_RUNNER_DIR"/* "$DOCKER_GHA_RUNNER_DIR"
123+
cp "$DOCKER_DOT_GITHUB_GHA_RUNNER_DIR"/* "$DOCKER_GHA_RUNNER_DIR"
124124
pushd "$DOCKER_GHA_RUNNER_DIR"
125125
local gha_runner_tarball="actions-runner-linux-${GHA_ARCH}-${DOCKER_GHA_RUNNER_VERSION}.tar.gz"
126126
wget -q https://github.com/actions/runner/releases/download/v${DOCKER_GHA_RUNNER_VERSION}/"$gha_runner_tarball"

‎docker/scripts/dbld_csit_install_packages.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
set -euxo pipefail
1717

18-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
19-
source "$CIMAN_DOCKER_SCRIPTS/lib_csit.sh"
18+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
19+
source "$DOT_GITHUB_DOCKER_SCRIPTS/lib_csit.sh"
2020

2121
must_be_run_in_docker_build
2222

‎docker/scripts/dbld_dump_build_logs.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
set -euxo pipefail
1717

18-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
19-
export CIMAN_ROOT=${CIMAN_ROOT:-"$(dirname $(dirname $CIMAN_DOCKER_SCRIPTS))"}
20-
. "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
18+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
19+
export DOT_GITHUB_ROOT=${DOT_GITHUB_ROOT:-"$(dirname $(dirname $DOT_GITHUB_DOCKER_SCRIPTS))"}
20+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_common.sh"
2121

2222
must_be_run_in_docker_build
2323

‎docker/scripts/dbld_lfit_requirements.sh‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
set -euxo pipefail
1717

18-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
19-
. "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
18+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
19+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_common.sh"
2020

2121
must_be_run_in_docker_build
2222

@@ -30,12 +30,6 @@ login \$pclogin
3030
password
3131
EOF
3232

33-
# Copy lf-env.sh for LF Releng scripts
34-
lf_env_sh="/root/lf-env.sh"
35-
cp "$DOCKER_CIMAN_ROOT/global-jjb/jenkins-init-scripts/lf-env.sh" "$lf_env_sh"
36-
chmod 644 "$lf_env_sh"
37-
cat <<EOF >>"$lf_env_sh"
38-
3933
# When running in CI docker image, use the pre-installed venv
4034
# instead of installing python packages every job run.
4135
#
@@ -45,7 +39,6 @@ lf-activate-venv() {
4539
PATH="\$LF_VENV/bin:\$PATH"
4640
return 0
4741
}
48-
EOF
4942

5043
# Install lftools & boto3 for log / artifact upload.
5144
pip_options=""

‎docker/scripts/dbld_vpp_install_packages.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
set -euxo pipefail
1717

18-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname "${BASH_SOURCE[0]}")"}
19-
. "$CIMAN_DOCKER_SCRIPTS/lib_vpp.sh"
20-
. "$CIMAN_DOCKER_SCRIPTS/lib_apt.sh"
18+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname "${BASH_SOURCE[0]}")"}
19+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_vpp.sh"
20+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_apt.sh"
2121

2222
must_be_run_in_docker_build
2323

‎docker/scripts/lib_apt.sh‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ select_dind_image() {
3636
esac
3737
}
3838

39-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
40-
. "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
41-
. "$CIMAN_DOCKER_SCRIPTS/lib_csit.sh"
39+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
40+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_common.sh"
41+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_csit.sh"
4242

4343
dump_apt_package_list() {
4444
branchname="$(echo $branch | sed -e 's,/,_,')"
@@ -62,16 +62,16 @@ generate_apt_dockerfile_common() {
6262
WORKDIR $DOCKER_DOWNLOADS_DIR
6363
6464
# Copy-in temporary build tree containing
65-
# ci-management, vpp, & csit git repos
65+
# .github, vpp, & csit git repos
6666
WORKDIR $DOCKER_BUILD_DIR
6767
COPY . .
6868
6969
# Build Environment Variables
7070
ENV DEBIAN_FRONTEND="noninteractive"
7171
ENV FDIOTOOLS_IMAGE="$executor_image"
7272
ENV FDIOTOOLS_EXECUTOR_CLASS="$executor_class"
73-
ENV CIMAN_ROOT="$DOCKER_CIMAN_ROOT"
74-
ENV PATH="\$PATH:$DOCKER_CIMAN_ROOT/docker/scripts"
73+
ENV DOT_GITHUB_ROOT="$DOCKER_DOT_GITHUB_ROOT"
74+
ENV PATH="\$PATH:$DOCKER_DOT_GITHUB_ROOT/docker/scripts"
7575
7676
# Configure locales
7777
RUN apt-get update -qq \\
@@ -88,26 +88,6 @@ ENV LANG="en_US.UTF-8" LANGUAGE="en_US" LC_ALL="en_US.UTF-8"
8888
8989
# Install baseline packages (minimum build & utils).
9090
#
91-
# ci-management global-jjb requirements:
92-
# facter
93-
# python3-pip
94-
# python3-venv
95-
# for lftools:
96-
# xmlstarlet
97-
# libxml2-dev
98-
# libxslt-dev
99-
# from packer/provision/baseline.sh:
100-
# unzip
101-
# xz-utils
102-
# git
103-
# git-review
104-
# libxml2-dev
105-
# libxml-xpath-perl
106-
# libxslt-dev
107-
# make
108-
# wget
109-
# jq
110-
#
11191
# Python build from source requirements:
11292
# build-essential
11393
#
@@ -311,16 +291,16 @@ csit_shim_generate_apt_dockerfile() {
311291
cat <<EOF >>"$DOCKERFILE"
312292
313293
# Copy-in temporary build tree containing
314-
# ci-management, vpp, & csit git repos
294+
# .github, vpp, & csit git repos
315295
WORKDIR $DOCKER_BUILD_DIR
316296
COPY . .
317297
318298
# Build Environment Variables
319299
ENV DEBIAN_FRONTEND="noninteractive"
320300
ENV FDIOTOOLS_IMAGE="$executor_image"
321301
ENV FDIOTOOLS_EXECUTOR_CLASS="$executor_class"
322-
ENV CIMAN_ROOT="$DOCKER_CIMAN_ROOT"
323-
ENV PATH="\$PATH:$DOCKER_CIMAN_ROOT/docker/scripts"
302+
ENV DOT_GITHUB_ROOT="$DOCKER_DOT_GITHUB_ROOT"
303+
ENV PATH="\$PATH:$DOCKER_DOT_GITHUB_ROOT/docker/scripts"
324304
325305
# Configure locales & timezone
326306
RUN apt-get update -qq \\

‎docker/scripts/lib_common.sh‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ if [ -n "$(alias lib_common_imported 2> /dev/null)" ] ; then
2020
fi
2121
alias lib_common_imported="true"
2222

23-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
24-
export CIMAN_ROOT="$(dirname $(dirname $CIMAN_DOCKER_SCRIPTS))"
23+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
24+
export DOT_GITHUB_ROOT="$(dirname $(dirname $DOT_GITHUB_DOCKER_SCRIPTS))"
2525

2626
must_be_run_as_root_or_docker_group() {
2727
set_opts="$-"
@@ -240,7 +240,7 @@ executor_verify_os_name() {
240240
export DOCKER_DATE=${DOCKER_DATE:-"$(date -u +%Y_%m_%d_%H%M%S_UTC)"}
241241
export DOCKER_BUILD_DIR="/scratch/docker-build"
242242
export DOCKER_BUILD_VENV_DIR="$DOCKER_BUILD_DIR"/venv
243-
export DOCKER_CIMAN_ROOT="$DOCKER_BUILD_DIR"/ci-management
243+
export DOCKER_DOT_GITHUB_ROOT="$DOCKER_BUILD_DIR"/.github
244244
export DOCKERFILE="$DOCKER_BUILD_DIR"/Dockerfile
245245
export DOCKERIGNOREFILE="$DOCKER_BUILD_DIR"/.dockerignore
246246
export DOCKERFILE_FROM=${DOCKERFILE_FROM:="${OS_ID}:${OS_VERSION_ID}"}
@@ -251,16 +251,12 @@ export DOCKER_CSIT_DIR="$DOCKER_BUILD_DIR"/csit
251251
export DOCKER_DOWNLOADS_DIR="/root/Downloads"
252252
export DOCKER_BUILD_FILES_DIR="$DOCKER_BUILD_DIR"/files
253253
export DOCKER_GOLANG_VERSION="1.25.4"
254-
export DOCKER_GHA_RUNNER_VERSION="2.330.0"
255-
export DOCKER_CIMAN_GHA_RUNNER_DIR="$DOCKER_CIMAN_ROOT"/docker/gha-runner
254+
export DOCKER_GHA_RUNNER_VERSION="2.331.0"
255+
export DOCKER_DOT_GITHUB_GHA_RUNNER_DIR="$DOCKER_DOT_GITHUB_ROOT"/docker/gha-runner
256256
export DOCKER_GHA_RUNNER_DIR="$DOCKER_BUILD_DIR"/gha-runner
257257

258258
docker_build_setup_ciman() {
259-
if [ "$(dirname $CIMAN_ROOT)" != "$DOCKER_BUILD_DIR" ] ; then
260-
echo_log "Updating $CIMAN_ROOT git submodules..."
261-
pushd "$CIMAN_ROOT"
262-
git submodule update --init --recursive
263-
popd
259+
if [ "$(dirname $DOT_GITHUB_ROOT)" != "$DOCKER_BUILD_DIR" ] ; then
264260
if [ -d "$DOCKER_BUILD_DIR" ] ; then
265261
echo_log "Removing existing DOCKER_BUILD_DIR: $DOCKER_BUILD_DIR..."
266262
local sudo_cmd=""
@@ -269,9 +265,9 @@ docker_build_setup_ciman() {
269265
fi
270266
${sudo_cmd} rm -rf "$DOCKER_BUILD_DIR"
271267
fi
272-
echo_log "Syncing $CIMAN_ROOT into $DOCKER_CIMAN_ROOT..."
268+
echo_log "Syncing $DOT_GITHUB_ROOT into $DOCKER_DOT_GITHUB_ROOT..."
273269
mkdir -p "$DOCKER_BUILD_DIR"
274-
rsync -a "$CIMAN_ROOT/." "$DOCKER_CIMAN_ROOT"
270+
rsync -a "$DOT_GITHUB_ROOT/." "$DOCKER_DOT_GITHUB_ROOT"
275271
else
276272
mkdir -p "$DOCKER_BUILD_DIR"
277273
fi

‎docker/scripts/lib_csit.sh‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@ if [ -n "$(alias lib_csit_imported 2> /dev/null)" ] ; then
2020
fi
2121
alias lib_csit_imported=true
2222

23-
export CIMAN_DOCKER_SCRIPTS="${CIMAN_DOCKER_SCRIPTS:-$(dirname ${BASH_SOURCE[0]})}"
24-
. "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
25-
. "$CIMAN_DOCKER_SCRIPTS/lib_apt.sh"
23+
export DOT_GITHUB_DOCKER_SCRIPTS="${DOT_GITHUB_DOCKER_SCRIPTS:-$(dirname ${BASH_SOURCE[0]})}"
24+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_common.sh"
25+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_apt.sh"
2626

2727
# Branches must be listed in chronological order -- oldest stable branch
2828
# first and master last.
2929
#
30-
# Note: CI Jobs for each architecture are maintained in
31-
# .../ci-management/jjb/vpp/vpp.yaml
32-
# All OS's and branches are included in the 'os' and 'stream'
33-
# definitions respectively, then the exclude list maintained
34-
# to create an enumerated set of jobs jobs that match the
35-
# definitions here.
3630
declare -A CSIT_VPP_BRANCHES
3731
CSIT_VPP_BRANCHES["ubuntu-24.04"]="stable/2506 stable/2510 master"
3832
export CSIT_VPP_BRANCHES

‎docker/scripts/lib_vpp.sh‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ if [ -n "$(alias lib_vpp_imported 2> /dev/null)" ] ; then
2020
fi
2121
alias lib_vpp_imported=true
2222

23-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname "${BASH_SOURCE[0]}")"}
24-
. "$CIMAN_DOCKER_SCRIPTS"/lib_common.sh
23+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname "${BASH_SOURCE[0]}")"}
24+
. "$DOT_GITHUB_DOCKER_SCRIPTS"/lib_common.sh
2525

2626

2727
VPP_SUPPORTED_EXECUTOR_CLASSES="builder"
@@ -114,13 +114,6 @@ docker_build_setup_vpp() {
114114

115115
# Branches must be listed in chronological order -- oldest stable branch
116116
# first and master last.
117-
#
118-
# Note: CI Jobs for each architecture are maintained in
119-
# .../ci-management/jjb/vpp/vpp.yaml
120-
# All OS's and branches are included in the 'os' and 'stream'
121-
# definitions respectively, then the exclude list maintained
122-
# to create an enumerated set of jobs jobs that match the
123-
# definitions here.
124117
declare -A VPP_BRANCHES
125118
VPP_BRANCHES["debian-12"]="stable/2506 stable/2510 master"
126119
VPP_BRANCHES["ubuntu-22.04"]="stable/2506 stable/2510 master"

‎docker/scripts/update_dockerhub_prod_tags.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ logname="/tmp/$(basename $0).$(date -u +%Y_%m_%d_%H%M%S).log"
2121
echo -e "\n*** Logging output to $logname ***\n"
2222
exec > >(tee -a $logname) 2>&1
2323

24-
export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
25-
. "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
24+
export DOT_GITHUB_DOCKER_SCRIPTS=${DOT_GITHUB_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
25+
. "$DOT_GITHUB_DOCKER_SCRIPTS/lib_common.sh"
2626

2727
# Global variables
2828
long_bar="################################################################"

0 commit comments

Comments
 (0)