Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: Move manifests to a saner location #1304

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

*: Move manifests to a saner location #1304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
46461e3
Move manifests to toplevel directory
krnowak Oct 24, 2023
6843fb7
.github: Use new location for manifests
krnowak Oct 24, 2023
051e5e9
*: Use new manifests location
krnowak Oct 25, 2023
2074fcd
ci-automation: Use new manifests location
krnowak Oct 24, 2023
e5d0cba
sdk_lib: Use new manifests location
krnowak Oct 24, 2023
0eb5f29
overlay: Use new manifests location
krnowak Oct 24, 2023
37d01fb
retag-for-jenkins: Drop obsolete comment
krnowak Oct 25, 2023
3efb48f
sdk_lib: Fix a quoting issue
krnowak Oct 25, 2023
cf65da0
build_toolchains: Make variables local
krnowak Oct 25, 2023
047d6e0
manifests: Update mantle tag
krnowak Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
.github: Use new location for manifests
  • Loading branch information
@krnowak
krnowak committed Nov 1, 2023
commit 6843fb701e32fe0aadb0f3c6a0347f99bb2eebad
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:

# This is also done again in run-kola-tests.yaml because these changes here disappear
source ci-automation/ci_automation_common.sh
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt

version="alpha-$FLATCAR_VERSION_ID"
check_version_string "$version"
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
source ci-automation/image_changes.sh

channel=alpha
vernum=$(source sdk_container/.repo/manifests/version.txt; echo "${FLATCAR_VERSION}")
vernum=$(source manifests/version.txt; echo "${FLATCAR_VERSION}")
board="${arch}-usr"

package_diff_env=(
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mantle-releases-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ jobs:
set -euo pipefail
set -x
commit=${{ steps.fetch-latest-mantle.outputs.COMMIT }}
if ! grep -q "ghcr.io/flatcar/mantle:git-${commit}" sdk_container/.repo/manifests/mantle-container; then
echo "ghcr.io/flatcar/mantle:git-${commit}" > sdk_container/.repo/manifests/mantle-container
git add sdk_container/.repo/manifests/mantle-container
if ! grep -q "ghcr.io/flatcar/mantle:git-${commit}" manifests/mantle-container; then
echo "ghcr.io/flatcar/mantle:git-${commit}" > manifests/mantle-container
git add manifests/mantle-container
fi
- name: Create pull request for branch
if: ${{ steps.figure-out-branch.outputs.SKIP == 0 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-kola-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:
pushd scripts

source ci-automation/ci_automation_common.sh
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt

version="alpha-$FLATCAR_VERSION_ID"
check_version_string "$version"
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
done
done

source sdk_container/.repo/manifests/version.txt
source manifests/version.txt
tap_generate_report "${all_archs}" "${FLATCAR_VERSION}" "md" "true" > test-results.md

cat test-results.md >> "$GITHUB_STEP_SUMMARY"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/setup-flatcar-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ sudo apt-get install -y docker-ce docker-ce-cli containerd.io \
pushd "${WORK_SCRIPTS_DIR}"

source ci-automation/ci_automation_common.sh
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt

# run_sdk_container requires a tag to exist in the repo it resides,
# which may not be the case for forked repos. Add some fake tag in
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-sdk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
set -euo pipefail

source ci-automation/ci_automation_common.sh
source sdk_container/.repo/manifests/version.txt
source manifests/version.txt

version="alpha-$FLATCAR_VERSION_ID"
sdk_version="${SOURCE_SDK_VERSION:-$FLATCAR_SDK_VERSION}"
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
echo "setting sdk_version=${target_version} as a github output"
echo "sdk_version=${target_version}" >> "$GITHUB_OUTPUT"

# This also updates sdk_container/.repo/manifests/version.txt with the new SDK version.
# This also updates manifests/version.txt with the new SDK version.
./update_sdk_container_image "${target_version}"

- name: Upload the SDK container and binary packages to bincache
Expand All @@ -144,7 +144,7 @@ jobs:
echo " User ${BUILDCACHE_USER}" >> ~/.ssh/config
echo " IdentityFile ~/.ssh/bincache" >> ~/.ssh/config

source sdk_container/.repo/manifests/version.txt
source manifests/version.txt
vernum="${FLATCAR_SDK_VERSION}"
docker_vernum="$(vernum_to_docker_image_version "${vernum}")"

Expand Down