diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b4ab7820f713538478849bccfa8e5b371f1be8a..aa8c69fdf4fd4283d0a6a33d1f56499dc58706e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,6 @@ stages: variables: MANIFEST_FILE: manifests/ci.xml BB_ENV_PASSTHROUGH_ADDITIONS: DISTRO MACHINE - SOURCE_MIRROR_URL_CH: http://114.116.235.68/source-mirror CI_ONIRO_BB_LOCAL_CONF_FETCHCMD_wget: "/usr/bin/env wget -L -t 6 -T 5 --no-check-certificate --passive-ftp" before_script: # Tell git this repository is safe even if cloned with a different uid @@ -270,26 +269,18 @@ fetch: else SOURCE_MIRROR_PATH="$CI_PROJECT_DIR/build/mirror" ; fi - - echo "Syncing mirror files to $SOURCE_MIRROR_PATH" - - if [ "$CI_SERVER_HOST" = "gitlab.eclipse.org" -a - "$CI_PROJECT_PATH" = "eclipse/oniro-core/meta-openharmony" -a - "$CI_COMMIT_BRANCH" = "kirkstone" ] ; then - DO_MIRROR_UPDATES_CH=1 ; - fi - mkdir -pv build/mirror-updates-ch - rm -f build/downloads/*.{done,resolved} build/downloads/npm2/*.{done,resolved} build/downloads/uninative/*/*.{done,resolved} - - for f in build/downloads/* build/downloads/npm2/* build/downloads/uninative/*/*; do if test -f "$f" -a ! -L "$f" ; then + - | + for f in build/downloads/* build/downloads/npm2/* build/downloads/uninative/*/*; do if test -f "$f" -a ! -L "$f" ; then fname=$(basename "$f") ; if [ -n "$SOURCE_MIRROR_PATH" -a ! -e "$SOURCE_MIRROR_PATH/$fname" ] ; then cp "$f" "$SOURCE_MIRROR_PATH/$fname~tmp" ; mv "$SOURCE_MIRROR_PATH/$fname~tmp" "$SOURCE_MIRROR_PATH/$fname" ; echo "Persisted mirror file $SOURCE_MIRROR_PATH/$fname" ; fi ; - if [ "$DO_MIRROR_UPDATES_CH" = 1 ] ; then - if ! curl --output /dev/null --silent --head --fail "$SOURCE_MIRROR_URL_CH/$fname" ; then - ln -v "$f" build/mirror-updates-ch/ ; - fi ; - fi ; + # [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]] && ln -v -f "$f" build/mirror-updates-ch/ + ln -v "$f" build/mirror-updates-ch/ fi ; done cache: policy: pull-push @@ -308,7 +299,7 @@ mirror_ch: - job: fetch artifacts: true rules: - - if: $CI_SERVER_HOST == "gitlab.eclipse.org" && $CI_PROJECT_PATH == "eclipse/oniro-core/meta-openharmony" && $CI_COMMIT_BRANCH == "kirkstone" + - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH" # No need to mark builds broken due to infrastructure problems allow_failure: true tags: @@ -391,7 +382,7 @@ build_ch: - if: $CHINA_CI != null variables: MANIFEST_FILE: manifests/gitee/ci.xml - SOURCE_MIRROR_URL: $SOURCE_MIRROR_URL_CH + SOURCE_MIRROR_URL: http://114.116.235.68/source-mirror # URL and filename for tarball containing entire OpenHarmony OS codebase .openharmony_tarball: