Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
592ab1eb
Commit
592ab1eb
authored
6 years ago
by
Michael Youngstrom
Browse files
Options
Downloads
Patches
Plain Diff
Fix quality and python private jobs
parent
1fa2570a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
scripts/jenkins-common.sh
+2
-1
2 additions, 1 deletion
scripts/jenkins-common.sh
scripts/xss-commit-linter.sh
+10
-2
10 additions, 2 deletions
scripts/xss-commit-linter.sh
tox.ini
+1
-0
1 addition, 0 deletions
tox.ini
with
13 additions
and
3 deletions
scripts/jenkins-common.sh
+
2
−
1
View file @
592ab1eb
...
...
@@ -18,7 +18,8 @@ mongo --quiet --eval 'db.getMongo().getDBNames().forEach(function(i){db.getSibli
# branch to a target branch; depending on how the GitHub plugin refspec
# is configured, this may not already be fetched.
if
[
!
-z
${
TARGET_BRANCH
+x
}
]
;
then
git fetch origin
$TARGET_BRANCH
:refs/remotes/origin/
$TARGET_BRANCH
TARGET_BRANCH_WITHOUT_ORIGIN
=
$(
echo
"
${
TARGET_BRANCH
}
"
|
sed
's:^origin/::'
)
git fetch origin
$TARGET_BRANCH_WITHOUT_ORIGIN
:refs/remotes/origin/
$TARGET_BRANCH_WITHOUT_ORIGIN
fi
# Reset the jenkins worker's virtualenv back to the
...
...
This diff is collapsed.
Click to expand it.
scripts/xss-commit-linter.sh
+
10
−
2
View file @
592ab1eb
...
...
@@ -60,8 +60,16 @@ done
current_branch_hash
=
`
git rev-parse HEAD
`
if
[
-z
"
${
MAIN_COMMIT
+x
}
"
]
;
then
# if commit is not set, get hash of current branch
MAIN_COMMIT
=
"origin/master"
if
[
-z
${
TARGET_BRANCH
+x
}
]
;
then
# if commit is not set and no target branch, get hash of current branch
MAIN_COMMIT
=
"origin/master"
else
if
[[
$TARGET_BRANCH
==
origin/
*
]]
;
then
MAIN_COMMIT
=
$TARGET_BRANCH
else
MAIN_COMMIT
=
origin/
$TARGET_BRANCH
fi
fi
fi
merge_base_command
=
"git merge-base
$current_branch_hash
$MAIN_COMMIT
"
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
1
−
0
View file @
592ab1eb
...
...
@@ -45,6 +45,7 @@ passenv =
SELENIUM_PORT
SHARD
SKIP_NPM_INSTALL
TARGET_BRANCH
TEST_SUITE
XDIST_CONTAINER_SECURITY_GROUP
XDIST_CONTAINER_SUBNET
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment