Skip to content

Commit

Permalink
multi-arch-pipeline: re-enable aws upload/testing
Browse files Browse the repository at this point in the history
Now that we've hacked in console=ttyS0 (see
coreos/fedora-coreos-tracker#920
now we can start to upload/test there again.
  • Loading branch information
dustymabe committed Sep 6, 2021
1 parent ddd9da9 commit 8cceaeb
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions jobs/multi-arch-pipeline.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,7 @@ EOF
// Key off of s3_stream_dir: i.e. if we're configured to upload artifacts
// to S3, we also take that to mean we should upload an AMI. We could
// split this into two separate developer knobs in the future.
// XXX disable AWS upload for now until AMI boot issue is fixed
if (false && s3_stream_dir && !is_mechanical) {
if (s3_stream_dir && !is_mechanical) {
stage('Upload AWS') {
def suffix = official ? "" : "--name-suffix ${developer_prefix}"
// pick up the AWS compressed vmdk and uncompress it
Expand Down Expand Up @@ -439,8 +438,7 @@ EOF
}

// Now that the metadata is uploaded go ahead and kick off some tests
// XXX disable AWS testing for now until AMI boot issue is fixed
if (false && !params.MINIMAL && s3_stream_dir &&
if (!params.MINIMAL && s3_stream_dir &&
utils.pathExists("\${AWS_FCOS_KOLA_BOT_CONFIG}") && !is_mechanical) {
stage('Kola:AWS') {
// We consider the AWS kola tests to be a followup job, so we use `wait: false` here.
Expand Down

0 comments on commit 8cceaeb

Please sign in to comment.