Skip to content

Commit 5bdf898

Browse files
committed
More support for running CI. Doesn't work yet of course but.. :)
1 parent f18ad5d commit 5bdf898

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

04_ocp_repo_sync.sh

+15-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ figlet "Syncing Installer repo" | lolcat
1111
if [ ! -d "$GOPATH/src/github.com/openshift/installer" ]; then
1212
git clone https://github.com/openshift/installer.git "$GOPATH/src/github.com/openshift/installer"
1313
fi
14-
cd "$GOPATH/src/github.com/openshift/installer"
1514

15+
pushd "$GOPATH/src/github.com/openshift/installer"
1616
git am --abort || true
1717
git checkout master
1818
git branch -D we_dont_need_no_stinkin_patches || true
@@ -25,19 +25,31 @@ echo $patch_file
2525
curl -L https://github.com/tomassedovic/installer/commit/dns-workaround.patch -o $patch_file
2626
sed -i "s/10.1.11.152/$BOOTSTRAP_FLOATING_IP/g" $patch_file
2727
git am < $patch_file
28-
28+
popd
2929

3030

3131
figlet "Syncing Terraform repo" | lolcat
3232

3333
mkdir -p $GOPATH/src/github.com/terraform-providers/
34-
cd $GOPATH/src/github.com/terraform-providers/
34+
pushd $GOPATH/src/github.com/terraform-providers/
3535
if [ ! -d terraform-provider-openstack ]; then
3636
git clone https://github.com/terraform-providers/terraform-provider-openstack
3737
fi
38+
popd
3839

3940
figlet "Syncing Openshift release repo" | lolcat
4041

4142
if [ ! -d $GOPATH/src/github.com/openshift/release ]; then
4243
git clone https://github.com/openshift/release.git $GOPATH/src/github.com/openshift/release
4344
fi
45+
46+
figlet "Syncing ci-operator repo" | lolcat
47+
48+
if [ ! -d $GOPATH/src/github.com/openshift/release ]; then
49+
git clone https://github.com/openshift/ci-operator.git "$GOPATH/src/github.com/openshift/ci-operator"
50+
fi
51+
52+
figlet "Syncing installer-e2e repo" | lolcat
53+
if [ ! -d installer-e2e ]; then
54+
git clone https://github.com/sallyom/installer-e2e
55+
fi

05_build_ocp_installer.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,23 @@ echo "$GOPATH" | lolcat # should print $HOME/go or something like that
77

88
figlet "Building terraform" | lolcat
99

10-
cd $GOPATH/src/github.com/terraform-providers/terraform-provider-openstack
10+
pushd $GOPATH/src/github.com/terraform-providers/terraform-provider-openstack
1111
make build
1212
mkdir -p ~/.terraform.d/plugins
1313
cd ~/.terraform.d/plugins/
1414
rm -f terraform-provider-openstack_v1.6.1
1515
ln -s ~/go/bin/terraform-provider-openstack terraform-provider-openstack_v1.6.1
16-
cd
16+
popd
1717

1818
figlet "Building the Installer" | lolcat
1919

20-
cd "$GOPATH/src/github.com/openshift/installer"
21-
20+
pushd "$GOPATH/src/github.com/openshift/installer"
2221
./hack/get-terraform.sh
2322
export MODE=dev
2423
./hack/build.sh
24+
popd
25+
26+
pushd "$GOPATH/src/github.com/openshift/ci-operator"
27+
make build
28+
popd
2529

ci_run.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
set -x
3+
set -e
4+
5+
$GOPATH/src/github.com/openshift/ci-operator/ci-operator -template installer-e2e/templates/cluster-launch-installer-e2e-modified.yaml -config $GOPATH/src/github.com/openshift/release/ci-operator/config/openshift/installer/openshift-installer-master.yaml -secret-dir=installer-e2e/cluster-profile-openstack -namespace=openstack --target=cluster-launch-installer-e2e-modified -git-ref=flaper87/installer@cloud-config-install-config

0 commit comments

Comments
 (0)