Skip to content

Commit

Permalink
Merge pull request mendersoftware#528 from oleorhagen/QA-161
Browse files Browse the repository at this point in the history
QA-161: Upgrade to the latest mendertesting library
  • Loading branch information
oleorhagen authored May 12, 2020
2 parents 412268f + 433f870 commit a78b45e
Show file tree
Hide file tree
Showing 16 changed files with 540 additions and 153 deletions.
10 changes: 10 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ test:
variables:
REPO_NAME: github.com/mendersoftware/mender
before_script:
# Rename the branch we're on, so that it's not in the way for the
# subsequent fetch. It's ok if this fails, it just means we're not on any
# branch.
- git branch -m temp-branch || true
# Git trick: Fetch directly into our local branches instead of remote
# branches.
- git fetch origin 'refs/heads/*:refs/heads/*'
# Get last remaining tags, if any.
- git fetch --tags origin

- mkdir -p /go/src/$(dirname $REPO_NAME)/mender /go/src/_/builds
- cp -r $CI_PROJECT_DIR /go/src/$(dirname $REPO_NAME)
- cd $GOPATH/src/$REPO_NAME
Expand Down
2 changes: 1 addition & 1 deletion LIC_FILES_CHKSUM.sha256
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Apache-2.0 license.
32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 LICENSE
beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE
32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mendertesting/LICENSE
32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE
#
# BSD 2 Clause license.
Expand Down
4 changes: 2 additions & 2 deletions license_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 Northern.tech AS
// Copyright 2020 Northern.tech AS
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -20,5 +20,5 @@ import mt "github.com/mendersoftware/mendertesting"

func TestLicenses(t *testing.T) {
os.Setenv("CHKSUM_FILE", "vendor/LIC_FILES_CHKSUM.sha256")
mt.CheckLicenses(t)
mt.CheckMenderCompliance(t)
}
2 changes: 1 addition & 1 deletion vendor/github.com/mendersoftware/mendertesting/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/mendersoftware/mendertesting/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 77 additions & 23 deletions vendor/github.com/mendersoftware/mendertesting/check_commits.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

128 changes: 105 additions & 23 deletions vendor/github.com/mendersoftware/mendertesting/check_license_go_code.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a78b45e

Please sign in to comment.