Skip to content
This repository was archived by the owner on Feb 5, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
417b10b
Cli tool (#2806)
alexsomesan Feb 5, 2018
67c070d
Fix bazel build for CLI (#2897)
alexsomesan Feb 5, 2018
b7921cc
platform/aws: move assets generation into own tf step
enxebre Feb 6, 2018
941b315
installer/pkg: Add config generators (#2751)
spangenberg Feb 8, 2018
4c287ce
Merge pull request #2905 from enxebre/assets
enxebre Feb 9, 2018
0936b1d
installer/pkg: Integrate config generator into CLI (#2936)
spangenberg Feb 13, 2018
7c45aec
platform/aws: add bootstrap node and step for joining it (#2924)
enxebre Feb 13, 2018
005c60d
Ignition assets (#2940)
enxebre Feb 14, 2018
a2c05a1
platform/aws: create bootstrap step (#2946)
enxebre Feb 14, 2018
6c7ffed
add multistep support for the cli - WIP - DO NOT MERGE (#2949)
enxebre Feb 15, 2018
06cec44
remove bootstrap ignition as part of rm-assets
enxebre Feb 15, 2018
dbf6eff
merge master into ut2 and fix conflicts
enxebre Feb 15, 2018
d9b10d0
reconcile with master kube tls changes
enxebre Feb 15, 2018
8da735e
update bazel for steps and cli
enxebre Feb 15, 2018
d7f6ea1
update Bazel cli target
enxebre Feb 15, 2018
9392c75
add cli to tarball target
enxebre Feb 15, 2018
19bf4f9
fix bazel golang deps
enxebre Feb 15, 2018
e572028
Merge pull request #2953 from enxebre/reconcile
enxebre Feb 16, 2018
8f7faaf
tests: Run rspec tests out of bazel build output
mxinden Feb 7, 2018
baad1c5
Merge pull request #2967 from mxinden/ut2-bazel-rspec
mxinden Feb 16, 2018
1fde22a
Merge pull request #2958 from enxebre/rm-ignition
enxebre Feb 16, 2018
7f7e7b8
installer: Integrate multistep cli with configuration (#2960)
spangenberg Feb 16, 2018
1aabedb
fix mixed vars
enxebre Feb 16, 2018
bfa7b4c
Merge pull request #2970 from enxebre/fix-mixed-var
enxebre Feb 16, 2018
e8f566e
cli: populate core config
enxebre Feb 19, 2018
03654fc
Merge pull request #2982 from enxebre/core-config
enxebre Feb 19, 2018
c193c0a
frontend: Generate YAML cluster config instead of tfvars file
kyoto Jan 23, 2018
f8e9a2f
tests/frontend: Update GUI Nightwatch tests to diff new YAML config file
kyoto Feb 2, 2018
bceb797
test/api: Skip some tests that will need changing for the new CLI
kyoto Feb 6, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
27 changes: 26 additions & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package(
template_files = glob([
"modules/**/*",
"platforms/**/*",
"steps/**/*",
])

config_setting(
Expand Down Expand Up @@ -84,6 +85,11 @@ alias(
actual = "//installer/cmd/installer:installer",
)

alias(
name = "cli",
actual = "//installer/cmd/tectonic:tectonic",
)

load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")

# We use a genrule here to combine the tarballs rather than a pkg_tar
Expand All @@ -94,6 +100,8 @@ genrule(
srcs = [
":tarball_installer_binary_darwin",
":tarball_installer_binary_linux",
":tarball_tectonic_binary_darwin",
":tarball_tectonic_binary_linux",
":tarball_terraform_configuration",
":tarball_terraform_binary_darwin",
":tarball_terraform_binary_linux",
Expand All @@ -119,7 +127,7 @@ genrule(
pkg_tar(
name = "tarball_terraform_configuration",
mode = "0644",
srcs = ["config.tf", "modules", "platforms"],
srcs = ["config.tf", "modules", "platforms", "steps"],
)

pkg_tar(
Expand All @@ -136,6 +144,20 @@ pkg_tar(
srcs = ["//installer/cmd/installer:linux"],
)

pkg_tar(
name = "tarball_tectonic_binary_darwin",
mode = "0755",
package_dir = "tectonic-installer/darwin",
srcs = ["//installer/cmd/tectonic:darwin"],
)

pkg_tar(
name = "tarball_tectonic_binary_linux",
mode = "0755",
package_dir = "tectonic-installer/linux",
srcs = ["//installer/cmd/tectonic:linux"],
)

pkg_tar(
name = "tarball_terraform_binary_darwin",
mode = "0755",
Expand Down Expand Up @@ -180,6 +202,9 @@ filegroup(
) + glob(
["platforms/**/*.tf"],
exclude_directories=1,
) + glob(
["steps/**/*.tf"],
exclude_directories=1,
) + ["config.tf"],
)

Expand Down
34 changes: 24 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,16 @@ pipeline {

withDockerContainer("quay.io/coreos/tectonic-builder:bazel-v0.2") {
sh"""#!/bin/bash -ex
bazel build tarball
bazel build tests/smoke
bazel build tarball tests/smoke
# bazel test terraform_fmt //installer/frontend:frontend_test --verbose_failures --test_output=errors

# Jenkins `stash` does not follow symlinks - thereby temporarily copy the files to the root dir
cp bazel-bin/tectonic.tar.gz .
cp bazel-bin/tests/smoke/linux_amd64_stripped/smoke .
"""

stash name: 'tectonic.tar.gz', includes: 'tectonic.tar.gz'
stash name: 'smoke-tests', includes: 'smoke'
}

withDockerContainer(params.builder_image) {
Expand All @@ -190,9 +196,7 @@ pipeline {
make test
rm -fr frontend/tests_output
"""
stash name: 'installer-binary', includes: 'installer/bin/linux/installer'
stash name: 'node-modules', includes: 'installer/frontend/node_modules/**'
stash name: 'smoke-test-binary', includes: 'bin/smoke'
}
}
withDockerContainer(tectonicSmokeTestEnvImage) {
Expand Down Expand Up @@ -468,6 +472,18 @@ def forcefullyCleanWorkspace() {
}
}

def unstashCleanRepoTectonicTarGZSmokeTests() {
unstash 'clean-repo'
unstash 'tectonic.tar.gz'
unstash 'smoke-tests'
sh """#!/bin/bash -ex
# Jenkins `stash` does not follow symlinks - thereby temporarily copy the files to the root dir
mkdir -p bazel-bin/tests/smoke/linux_amd64_stripped/
cp tectonic.tar.gz bazel-bin/.
cp smoke bazel-bin/tests/smoke/linux_amd64_stripped/.
"""
}

def runRSpecTest(testFilePath, dockerArgs, credentials) {
return {
node('worker && ec2') {
Expand All @@ -481,8 +497,7 @@ def runRSpecTest(testFilePath, dockerArgs, credentials) {
image: tectonicSmokeTestEnvImage,
args: '-u root -v /var/run/docker.sock:/var/run/docker.sock ' + dockerArgs
) {
unstash 'clean-repo'
unstash 'smoke-test-binary'
unstashCleanRepoTectonicTarGZSmokeTests()
sh """#!/bin/bash -ex
mkdir -p templogfiles && chmod 777 templogfiles
cd tests/rspec
Expand All @@ -500,7 +515,7 @@ def runRSpecTest(testFilePath, dockerArgs, credentials) {
} finally {
reportStatusToGithub((err == null) ? 'success' : 'failure', testFilePath, originalCommitId)
step([$class: "TapPublisher", testResults: "templogfiles/*", outputTapToConsole: true, planRequired: false])
archiveArtifacts allowEmptyArchive: true, artifacts: 'build/**/logs/**'
archiveArtifacts allowEmptyArchive: true, artifacts: 'bazel-bin/tectonic/build/**/logs/**'
withDockerContainer(params.builder_image) {
withCredentials(credsUI) {
script {
Expand Down Expand Up @@ -530,8 +545,7 @@ def runRSpecTestBareMetal(testFilePath, credentials) {
try {
timeout(time: 5, unit: 'HOURS') {
ansiColor('xterm') {
unstash 'clean-repo'
unstash 'smoke-test-binary'
unstashCleanRepoTectonicTarGZSmokeTests()
withCredentials(credentials + quayCreds) {
sh """#!/bin/bash -ex
cd tests/rspec
Expand All @@ -552,7 +566,7 @@ def runRSpecTestBareMetal(testFilePath, credentials) {
} finally {
reportStatusToGithub((err == null) ? 'success' : 'failure', testFilePath, originalCommitId)
step([$class: "TapPublisher", testResults: "../../templogfiles/*", outputTapToConsole: true, planRequired: false])
archiveArtifacts allowEmptyArchive: true, artifacts: 'build/**/logs/**'
archiveArtifacts allowEmptyArchive: true, artifacts: 'bazel-bin/tectonic/build/**/logs/**'
withCredentials(credsUI) {
script {
try {
Expand Down
4 changes: 4 additions & 0 deletions contrib/tectonic-cli-examples/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Running

`tectonic init --config=contrib/tectonic-cli-examples/config.yml`
`tectonic install assets --dir=Example`
Loading