Change default branch to main (#355)
This commit is contained in:
Родитель
e42d0a9d23
Коммит
43ffb961db
|
@ -140,4 +140,4 @@ workflows:
|
||||||
- docs
|
- docs
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only: master
|
only: main
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Firefox Telemetry Python ETL
|
# Firefox Telemetry Python ETL
|
||||||
|
|
||||||
[![CircleCI](https://circleci.com/gh/mozilla/python_mozetl.svg?style=svg)](https://circleci.com/gh/mozilla/python_mozetl)
|
[![CircleCI](https://circleci.com/gh/mozilla/python_mozetl.svg?style=svg)](https://circleci.com/gh/mozilla/python_mozetl)
|
||||||
[![codecov](https://codecov.io/gh/mozilla/python_mozetl/branch/master/graph/badge.svg)](https://codecov.io/gh/mozilla/python_mozetl)
|
[![codecov](https://codecov.io/gh/mozilla/python_mozetl/branch/main/graph/badge.svg)](https://codecov.io/gh/mozilla/python_mozetl)
|
||||||
|
|
||||||
This repository is a collection of ETL jobs for Firefox Telemetry.
|
This repository is a collection of ETL jobs for Firefox Telemetry.
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ It may be used with [ATMO](https://analysis.telemetry.mozilla.org/) to manually
|
||||||
|
|
||||||
In an SSH session with an ATMO cluster, grab a copy of the script:
|
In an SSH session with an ATMO cluster, grab a copy of the script:
|
||||||
```
|
```
|
||||||
$ wget https://raw.githubusercontent.com/mozilla/python_mozetl/master/bin/mozetl-submit.sh
|
$ wget https://raw.githubusercontent.com/mozilla/python_mozetl/main/bin/mozetl-submit.sh
|
||||||
```
|
```
|
||||||
Push your code to your own fork, where the job has been added to `mozetl.cli`. Then run it.
|
Push your code to your own fork, where the job has been added to `mozetl.cli`. Then run it.
|
||||||
|
|
||||||
|
|
|
@ -160,7 +160,7 @@ def parse_arguments():
|
||||||
help="The URL to the git repository e.g. https://github.com/mozilla/python_mozetl.git",
|
help="The URL to the git repository e.g. https://github.com/mozilla/python_mozetl.git",
|
||||||
)
|
)
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"--git-branch", type=str, default="master", help="The branch to run e.g. master"
|
"--git-branch", type=str, default="main", help="The branch to run e.g. main"
|
||||||
)
|
)
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"--node-type-id", type=str, default="c3.4xlarge", help="EC2 Node type"
|
"--node-type-id", type=str, default="c3.4xlarge", help="EC2 Node type"
|
||||||
|
|
|
@ -53,7 +53,7 @@ fi
|
||||||
# set script environment variables
|
# set script environment variables
|
||||||
MOZETL_ARGS=${MOZETL_COMMAND:-$@}
|
MOZETL_ARGS=${MOZETL_COMMAND:-$@}
|
||||||
MOZETL_GIT_PATH=${MOZETL_GIT_PATH:-https://github.com/mozilla/python_mozetl.git}
|
MOZETL_GIT_PATH=${MOZETL_GIT_PATH:-https://github.com/mozilla/python_mozetl.git}
|
||||||
MOZETL_GIT_BRANCH=${MOZETL_GIT_BRANCH:-master}
|
MOZETL_GIT_BRANCH=${MOZETL_GIT_BRANCH:-main}
|
||||||
MOZETL_SPARK_MASTER=${MOZETL_SPARK_MASTER:-yarn}
|
MOZETL_SPARK_MASTER=${MOZETL_SPARK_MASTER:-yarn}
|
||||||
MOZETL_SUBMISSION_METHOD=${MOZETL_SUBMISSION_METHOD:-spark}
|
MOZETL_SUBMISSION_METHOD=${MOZETL_SUBMISSION_METHOD:-spark}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче